diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py
index e09bbbf..86539a9 100644
--- a/obmc/mapper/server.py
+++ b/obmc/mapper/server.py
@@ -583,7 +583,7 @@
                 x[1],
                 ifaces))
 
-        return dict(filter(lambda x: x[1], map(obj_map, iter(item))))
+        return dict(filter(lambda x: x[1], map(obj_map, iter(item or []))))
 
     @dbus.service.method(obmc.mapper.MAPPER_IFACE, 'sas', 'a{sas}')
     def GetObject(self, path, interfaces):