Fixed bug if handler is not found