diff --git a/node/datastore.py b/node/datastore.py
index c434fe1d2..23f9ef156 100755
--- a/node/datastore.py
+++ b/node/datastore.py
@@ -122,13 +122,11 @@ def keys(self):
         keys = []
         try:
             db_keys = self.db.selectEntries("datastore")
-
             for row in db_keys:
                 keys.append(row['key'].decode('hex'))
-
-        finally:
-            # self.log.info('Keys: %s' % keys)
-            return keys
+        except:
+            pass
+        return keys
 
     def lastPublished(self, key):
         """ Get the time the C{(key, value)} pair identified by C{key}
@@ -241,13 +239,11 @@ def keys(self):
         keys = []
         try:
             db_keys = self.db.selectEntries("datastore")
-
             for row in db_keys:
                 keys.append(row['key'].decode('hex'))
-
-        finally:
-            # self.log.info('Keys: %s' % keys)
-            return keys
+        except:
+            pass
+        return keys
 
     def lastPublished(self, key):
         """ Get the time the C{(key, value)} pair identified by C{key}