diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 8a3bf10e1..566dceed1 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -975,8 +975,11 @@ server_disconnect (t_irc_server *server, int reconnect)
     
     server_close_connection (server);
     
-    irc_display_prefix (server->buffer, PREFIX_INFO);
-    gui_printf (server->buffer, _("Disconnected from server!\n"));
+    if (server->buffer)
+    {
+        irc_display_prefix (server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer, _("Disconnected from server!\n"));
+    }
     
     server->is_away = 0;
     server->away_time = 0;
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 8a3bf10e1..566dceed1 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -975,8 +975,11 @@ server_disconnect (t_irc_server *server, int reconnect)
     
     server_close_connection (server);
     
-    irc_display_prefix (server->buffer, PREFIX_INFO);
-    gui_printf (server->buffer, _("Disconnected from server!\n"));
+    if (server->buffer)
+    {
+        irc_display_prefix (server->buffer, PREFIX_INFO);
+        gui_printf (server->buffer, _("Disconnected from server!\n"));
+    }
     
     server->is_away = 0;
     server->away_time = 0;