Fixed a bug with calling a non-existent handler