diff --git a/ChangeLog b/ChangeLog
index 98535983..5e59cb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-23  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugins.c:
+   Add debug message if plugin has not set a name for its keybinding
+   group.
+
+
 2009-06-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/highlighting.c, doc/geany.txt, doc/geany.html,
diff --git a/src/plugins.c b/src/plugins.c
index 1fc8e9e4..1580195f 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -484,7 +484,13 @@ add_kb_group(Plugin *plugin)
 {
 	guint i;
 
-	g_return_if_fail(NZV(plugin->key_group->name));
+	if (!NZV(plugin->key_group->name))
+	{
+		geany_debug("Plugin \"%s\" has not set a name for its keybinding group"
+			" - ignoring all keybindings!",
+			plugin->info.name);
+		return;
+	}
 	g_return_if_fail(! g_str_equal(plugin->key_group->name, keybindings_keyfile_group_name));
 
 	for (i = 0; i < plugin->key_group->count; i++)