Use proper error handling for departure