diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index a6ea87d44..4ff3832a7 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -5091,8 +5091,8 @@ command_set_display_option (struct t_config_option *option,
                                            "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                            "%s%s.%s.%s%s = %s%s%s%s%s%s%s%s%s%s",
                                            (message) ? message : "  ",
-                                           option->config_file->name,
-                                           option->section->name,
+                                           (option->config_file) ? option->config_file->name : "",
+                                           (option->section) ? option->section->name : "",
                                            option->name,
                                            GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
                                            GUI_COLOR(GUI_COLOR_CHAT_VALUE),
@@ -5127,8 +5127,8 @@ command_set_display_option (struct t_config_option *option,
                                                "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                                "%s%s.%s.%s%s = %s%s%s%s%s%s%s%s%s%s",
                                                (message) ? message : "  ",
-                                               option->config_file->name,
-                                               option->section->name,
+                                               (option->config_file) ? option->config_file->name : "",
+                                               (option->section) ? option->section->name : "",
                                                option->name,
                                                GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
                                                GUI_COLOR(GUI_COLOR_CHAT_VALUE),
@@ -5148,8 +5148,8 @@ command_set_display_option (struct t_config_option *option,
                                                "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                                "%s%s.%s.%s%s = %s%d%s%s%s%s%s%s%s%s",
                                                (message) ? message : "  ",
-                                               option->config_file->name,
-                                               option->section->name,
+                                               (option->config_file) ? option->config_file->name : "",
+                                               (option->section) ? option->section->name : "",
                                                option->name,
                                                GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
                                                GUI_COLOR(GUI_COLOR_CHAT_VALUE),
@@ -5174,8 +5174,8 @@ command_set_display_option (struct t_config_option *option,
                                            "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                            "%s%s.%s.%s%s = \"%s%s%s\"%s%s%s%s%s%s%s%s%s%s%s",
                                            (message) ? message : "  ",
-                                           option->config_file->name,
-                                           option->section->name,
+                                           (option->config_file) ? option->config_file->name : "",
+                                           (option->section) ? option->section->name : "",
                                            option->name,
                                            GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
                                            GUI_COLOR(GUI_COLOR_CHAT_VALUE),
@@ -5208,8 +5208,8 @@ command_set_display_option (struct t_config_option *option,
                                            "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                            "%s%s.%s.%s%s = %s%s%s%s%s%s%s%s%s%s",
                                            (message) ? message : "  ",
-                                           option->config_file->name,
-                                           option->section->name,
+                                           (option->config_file) ? option->config_file->name : "",
+                                           (option->section) ? option->section->name : "",
                                            option->name,
                                            GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
                                            GUI_COLOR(GUI_COLOR_CHAT_VALUE),
@@ -5234,8 +5234,8 @@ command_set_display_option (struct t_config_option *option,
                                    "no_trigger," GUI_CHAT_TAG_NO_HIGHLIGHT,
                                    "%s%s.%s.%s",
                                    (message) ? message : "  ",
-                                   option->config_file->name,
-                                   option->section->name,
+                                   (option->config_file) ? option->config_file->name : "",
+                                   (option->section) ? option->section->name : "",
                                    option->name);
     }
 }