diff --git a/girepository/tools/generate.c b/girepository/tools/generate.c
index c63acdccb..01f47767c 100644
--- a/girepository/tools/generate.c
+++ b/girepository/tools/generate.c
@@ -33,6 +33,16 @@
 static gchar *output = NULL;
 gchar **includedirs = NULL;
 
+static void 
+check_unresolved (GIBaseInfo *info)
+{
+  if (g_base_info_get_type (info) != GI_INFO_TYPE_UNRESOLVED)
+    return;
+
+  g_critical ("Found unresolved type '%s' '%s'\n", 
+	      g_base_info_get_name (info), g_base_info_get_namespace (info));
+}
+
 static void 
 write_type_name (const gchar *namespace,
 		 GIBaseInfo  *info,
@@ -77,6 +87,8 @@ write_type_info (const gchar *namespace,
     "filename"
   };
 
+  check_unresolved ((GIBaseInfo*)info);
+
   tag = g_type_info_get_tag (info);
   is_pointer = g_type_info_is_pointer (info);