Added exception to controller