current_trip method now checks for nil current_trip_id