fixed a few null cases in checkin