diff --git a/ChangeLog b/ChangeLog
index 3111a9381..40984c187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/term.h (grub_term_register_input,
+	grub_term_register_output): Check return of terminal init()
+	routines, and abort if errors are raised.
+
+	* commands/terminal.c: Update copyright year.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* commands/terminal.c (grub_cmd_terminal_input)
diff --git a/commands/terminal.c b/commands/terminal.c
index bf4187180..e725123b8 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/grub/term.h b/include/grub/term.h
index 3d644b848..143aabe1e 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -208,9 +208,8 @@ grub_term_register_input (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (term->init)
-        term->init ();
-      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
+      if (! term->init || term->init () == GRUB_ERR_NONE)
+	grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
     }
 }
 
@@ -224,10 +223,9 @@ grub_term_register_output (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (term->init)
-	term->init ();
-      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-		      GRUB_AS_LIST (term));
+      if (! term->init || term->init () == GRUB_ERR_NONE)
+	grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
+			GRUB_AS_LIST (term));
     }
 }