Removed completely the dougnut mock and adding try and catch block around every call the controller