Remove stupid exception trap in controller