diff --git a/admin/__init__.py b/admin/__init__.py
index 28987a726..2c47c441a 100644
--- a/admin/__init__.py
+++ b/admin/__init__.py
@@ -42,7 +42,7 @@ def enabled_applications():
     """
     result = [("admin", "admin"), ("userprefs", "userprefs")]
     try:
-        exts = list(Extension.objects.filter(enabled=True))
+        exts = Extension.objects.filter(enabled=True)
     except DatabaseError:
         exts = []
     result += [(ext.name, ext.name) for ext in exts]
diff --git a/admin/models.py b/admin/models.py
index ae8f469aa..97e2579b5 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -810,7 +810,8 @@ class Extension(models.Model):
         super(Extension, self).__init__(*args, **kwargs)
         if self.name:
             self.instance = exts_pool.get_extension(self.name)
-            self.__get_ext_dir()
+            if self.instance:
+                self.__get_ext_dir()
 
     def __get_ext_dir(self):
         modname = self.instance.__module__