Correct map - if statement checking for null building no