Fix violent exit into a sweet return