diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index f47b02b6a..478c5972c 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -644,7 +644,12 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
         }
     }
     
-    return WEECHAT_RC_OK;
+    gui_chat_printf (NULL,
+                     _("%sError: unknown option for \"%s\" "
+                       "command"),
+                     gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                     "buffer");
+    return WEECHAT_RC_ERROR;
 }
 
 /*
@@ -2623,16 +2628,13 @@ command_window (void *data, struct t_gui_buffer *buffer,
         if (argc > 2)
             gui_window_scroll (gui_current_window, argv[2]);
     }
-    else
-    {
-        gui_chat_printf (NULL,
-                         _("%sError: unknown option for \"%s\" command"),
-                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                         "window");
-        return WEECHAT_RC_ERROR;
-    }
     
-    return WEECHAT_RC_OK;
+    gui_chat_printf (NULL,
+                     _("%sError: unknown option for \"%s\" "
+                       "command"),
+                     gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                     "window");
+    return WEECHAT_RC_ERROR;
 }
 
 /*