Updated the controller to throw the new exceptions