Exception handling in controller added