Better fix for infinite recursion; don't return from exit_cleanup