Fixed controller to check if handler exists