diff --git a/contrib/python/nwgeom.py b/contrib/python/nwgeom.py
index 305ee2b6bd..cb71f2400e 100644
--- a/contrib/python/nwgeom.py
+++ b/contrib/python/nwgeom.py
@@ -11,6 +11,8 @@ def geom_get_coords(name):
     actualname = rtdb_get(name)
   except NWChemError:
     actualname = name
+  if actualname is None:
+    actualname = name
   coords = rtdb_get('geometry:' + actualname + ':coords')
   units = rtdb_get('geometry:'+actualname+':user units')
   if (units == 'a.u.'):
@@ -35,6 +37,8 @@ def geom_set_coords(name,coords):
     actualname = rtdb_get(name)
   except NWChemError:
     actualname = name
+  if actualname is None:
+    actualname = name
   units = rtdb_get('geometry:'+actualname+':user units')
   if (units == 'a.u.'):
     factor = 1.0