The buildingId was not cleared when an invalid building was entered

AFDP-116