Fix first_time error cases