diff --git a/pisi/component.py b/pisi/component.py
index 1dd6252a..63b10808 100644
--- a/pisi/component.py
+++ b/pisi/component.py
@@ -88,7 +88,7 @@ class ComponentDB(object):
         self.d.close()
 
     def has_component(self, name):
-        return self.d.has_key(name)
+        return self.d.has_key(str(name))
 
     def get_component(self, name):
         if not self.has_component(name):
diff --git a/pisi/packagedb.py b/pisi/packagedb.py
index bf07c7f9..2e213a5a 100644
--- a/pisi/packagedb.py
+++ b/pisi/packagedb.py
@@ -135,7 +135,7 @@ def get_rev_deps(name):
     if inst_packagedb.has_package(name):
         return inst_packagedb.get_rev_deps(name)
 
-    return None
+    return []
 
 def remove_package(name):
     # remove the guy from the tracking databases