Adds check for null callbacks
Merge branch 'hotfix/Null_callbacks' into develop