More graceful quit in case of error