Fix exiting on error
cleanup