#642 - Update controller to catch correct exceptions.