Also remove else with throw