diff --git a/pisi/db/groupdb.py b/pisi/db/groupdb.py
index 26778ef1..56f54acc 100644
--- a/pisi/db/groupdb.py
+++ b/pisi/db/groupdb.py
@@ -65,4 +65,10 @@ class GroupDB(lazydb.LazyDB):
         return group
 
     def get_group_components(self, name, repo=None):
-        return self.gcdb.get_item(name, repo)
+        if not self.has_group(name, repo):
+            raise Exception(_('Group %s not found') % name)
+
+        if self.gcdb.has_item(name):
+            return self.gcdb.get_item(name, repo)
+
+        return []