Changed one more exit_cleanup() call into EXIT_OR_RETURN().