diff --git a/ChangeLog b/ChangeLog
index 37cecba4b..b6690a0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/keyfile-test.c (test_comments): Add a test for
+	the previous change.
+
 	* glib/gkeyfile.c (g_key_file_lookup_group_node): Remove
 	redundant code.
 	(g_key_file_get_group_comment): Don't dereference before
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 37cecba4b..b6690a0aa 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2006-04-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/keyfile-test.c (test_comments): Add a test for
+	the previous change.
+
 	* glib/gkeyfile.c (g_key_file_lookup_group_node): Remove
 	redundant code.
 	(g_key_file_get_group_comment): Don't dereference before
diff --git a/tests/keyfile-test.c b/tests/keyfile-test.c
index e9ec9229f..df51d14f2 100644
--- a/tests/keyfile-test.c
+++ b/tests/keyfile-test.c
@@ -509,6 +509,12 @@ test_comments (void)
   check_name ("group comment", comment, group_comment, 0);
   g_free (comment);
 
+  comment = g_key_file_get_comment (keyfile, "group3", NULL, &error);
+  check_error (&error, 
+	       G_KEY_FILE_ERROR,
+	       G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
+  g_assert (comment == NULL);
+
   g_key_file_free (keyfile);
 }