diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 47b379c9..1547ecef 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -838,7 +838,7 @@ gam update notification|notifications [(id all)|(id <NotificationID>)*] unread|r
 gam delete notification|notifications [(id all)|(id <NotificationID>)*]
 gam info notification|notifications [unreadonly]
 
-gam create building <BuildingID> <BuildingAttributes>*
+gam create building <Name> <BuildingAttributes>*
 gam update building <BuildIngID> <BuildingAttributes>*
 gam delete building <BuildingID>
 gam info building <BuildingID>
diff --git a/src/gam.py b/src/gam.py
index bd204946..b4577130 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -8025,8 +8025,7 @@ def _getBuildingNameById(cd, buildingId):
     _makeBuildingIdNameMap(cd)
   if buildingId in GM_Globals[GM_MAP_BUILDING_ID_TO_NAME]:
     return GM_Globals[GM_MAP_BUILDING_ID_TO_NAME][buildingId]
-  print u'ERROR: No such building %s' % buildingId
-  sys.exit(3)
+  return u'UNKNOWN'
 
 def doUpdateBuilding():
   cd = buildGAPIObject(u'directory')