diff --git a/girepository.c b/girepository.c
index 15e043554..7cb81f30d 100644
--- a/girepository.c
+++ b/girepository.c
@@ -252,6 +252,9 @@ register_internal (GIRepository *repository,
       g_hash_table_insert (repository->priv->typelibs, key, (void *)typelib);
     }
 
+  if (typelib->modules == NULL)
+    typelib->modules = g_list_append(typelib->modules, g_module_open (NULL, 0));
+
   return namespace;
 }
 
diff --git a/gtypelib.c b/gtypelib.c
index 34a65e880..df99eb433 100644
--- a/gtypelib.c
+++ b/gtypelib.c
@@ -2059,7 +2059,7 @@ g_typelib_free (GTypelib *typelib)
 }
 
 const gchar *
-g_typelib_get_namespace(GTypelib *typelib)
+g_typelib_get_namespace (GTypelib *typelib)
 {
   return g_typelib_get_string (typelib, ((Header *) typelib->data)->namespace);
 }
@@ -2074,7 +2074,7 @@ g_typelib_get_namespace(GTypelib *typelib)
  * Return value: #TRUE on success
  **/
 gboolean
-g_typelib_symbol(GTypelib *typelib, const char *symbol_name, gpointer *symbol)
+g_typelib_symbol (GTypelib *typelib, const char *symbol_name, gpointer *symbol)
 {
   GList *l;