Adds checks to null callbacks
Merge pull request #4 from jaunesarmiento/develop

Adds checks to null callbacks