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