diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index 49e984b71..b48d66f08 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -8278,9 +8278,9 @@ Content of hashtable sent to callback (keys and values are of type "string"):
 | _x                      | column on screen          2+| "0" ... "n"
 | _y                      | line on screen            2+| "0" ... "n"
 | _key                    | key or mouse event        2+| "button1", "button2-gesture-left", ...
-| _window                 | pointer to window           | "0x12345678"                                     | "0x0"
+| _window                 | pointer to window           | "0x12345678"                                     | ""
 | _window_number          | number of window            | "1" ... "n"                                      | "*"
-| _buffer                 | pointer to buffer           | "0x12345678"                                     | "0x0"
+| _buffer                 | pointer to buffer           | "0x12345678"                                     | ""
 | _buffer_number          | number of buffer            | "1" ... "n"                                      | "-1"
 | _buffer_plugin          | plugin name of buffer       | "core", "irc", ...                               | ""
 | _buffer_name            | name of buffer              | "weechat", "freenode.#weechat", ...              | ""
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index 5dc4dde70..fa0c258d2 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -8415,9 +8415,9 @@ Contenu de la hashtable envoyée au "callback" (les clés et valeurs sont de typ
 | _x                      | colonne sur l'écran           2+| "0" ... "n"
 | _y                      | ligne sur l'écran             2+| "0" ... "n"
 | _key                    | touche ou évènement souris    2+| "button1", "button2-gesture-left", ...
-| _window                 | pointeur vers la fenêtre        | "0x12345678"                                     | "0x0"
+| _window                 | pointeur vers la fenêtre        | "0x12345678"                                     | ""
 | _window_number          | numéro de la fenêtre            | "1" ... "n"                                      | "*"
-| _buffer                 | pointeur vers le tampon         | "0x12345678"                                     | "0x0"
+| _buffer                 | pointeur vers le tampon         | "0x12345678"                                     | ""
 | _buffer_number          | numéro du tampon                | "1" ... "n"                                      | "-1"
 | _buffer_plugin          | nom d'extension du tampon       | "core", "irc", ...                               | ""
 | _buffer_name            | nom du tampon                   | "weechat", "freenode.#weechat", ...              | ""
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index 7448fe3ff..e1bddec96 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -8335,9 +8335,9 @@ Content of hashtable sent to callback (keys and values are of type "string"):
 | _x                      | column on screen          2+| "0" ... "n"
 | _y                      | line on screen            2+| "0" ... "n"
 | _key                    | key or mouse event        2+| "button1", "button2-gesture-left", ...
-| _window                 | pointer to window           | "0x12345678"                                     | "0x0"
+| _window                 | pointer to window           | "0x12345678"                                     | ""
 | _window_number          | number of window            | "1" ... "n"                                      | "*"
-| _buffer                 | pointer to buffer           | "0x12345678"                                     | "0x0"
+| _buffer                 | pointer to buffer           | "0x12345678"                                     | ""
 | _buffer_number          | number of buffer            | "1" ... "n"                                      | "-1"
 | _buffer_plugin          | plugin name of buffer       | "core", "irc", ...                               | ""
 | _buffer_name            | name of buffer              | "weechat", "freenode.#weechat", ...              | ""
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index ba6980fb0..0257e5a43 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -1475,7 +1475,7 @@ gui_bar_item_focus_buffer_nicklist (void *data,
     
     window = (struct t_gui_window *)value;
     if (!window)
-        window = gui_current_window;
+        return NULL;
     
     error = NULL;
     bar_item_line = (int) strtol (str_bar_item_line, &error, 10);
diff --git a/src/gui/gui-focus.c b/src/gui/gui-focus.c
index 31e7285f7..1debffd43 100644
--- a/src/gui/gui-focus.c
+++ b/src/gui/gui-focus.c
@@ -52,9 +52,16 @@
     snprintf (str_value, sizeof (str_value), "%ld", __time);            \
     hashtable_set (hashtable, __name, str_value);
 #define FOCUS_PTR(__name, __pointer)                                    \
-    snprintf (str_value, sizeof (str_value),                            \
-              "0x%lx", (long unsigned int)__pointer);                   \
-    hashtable_set (hashtable, __name, str_value);
+    if (__pointer)                                                      \
+    {                                                                   \
+        snprintf (str_value, sizeof (str_value),                        \
+                  "0x%lx", (long unsigned int)__pointer);               \
+        hashtable_set (hashtable, __name, str_value);                   \
+    }                                                                   \
+    else                                                                \
+    {                                                                   \
+        hashtable_set (hashtable, __name, "");                          \
+    }
 
 
 /*