Fix: handle null cases in callback functions

Fix: handle null cases in callback functions #35