Clean up error handling in checkin a bit