diff --git a/ChangeLog b/ChangeLog
index e927a455c..8563c418f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/terminfo.c (grub_terminfo_output_unregister):
+	Mark calling with invalid term as GRUB_ERR_BUG.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/net/tftp.c (tftp_receive): Silently discard too short
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index 5fb2d6dea..cee146fba 100644
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -205,7 +205,7 @@ grub_terminfo_output_unregister (struct grub_term_output *term)
 	*ptr = ((struct grub_terminfo_output_state *) (*ptr)->data)->next;
 	return GRUB_ERR_NONE;
       }
-  return grub_error (GRUB_ERR_BAD_ARGUMENT, "terminal not found");
+  return grub_error (GRUB_ERR_BUG, "terminal not found");
 }
 
 /* Wrapper for grub_putchar to write strings.  */