Handler no longer exists
Merge pull request #557 from gjaldon/handle-non-existent

Handler no longer exists