Add another else with an exception to be future proof?