Fixes #740 - Make sure callbacks exist before marking them as 'handled'.
Merge pull request #741 from mstuart/master

Fixes #740 - Make sure callbacks exist before marking them as 'handled'.