Fix nullpointer exception from BuildingList