diff --git a/src/common/weechat.c b/src/common/weechat.c
index b5ac859f3..f9b595c17 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -410,7 +410,8 @@ main (int argc, char *argv[])
         case 0:                     /* config file OK                       */
             break;
         case -1:                    /* config file not found                */
-            config_create_default ();
+            if (config_create_default () < 0)
+                return 1;
             config_read ();
             break;
         default:                    /* other error (fatal)                  */
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index b5ac859f3..f9b595c17 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -410,7 +410,8 @@ main (int argc, char *argv[])
         case 0:                     /* config file OK                       */
             break;
         case -1:                    /* config file not found                */
-            config_create_default ();
+            if (config_create_default () < 0)
+                return 1;
             config_read ();
             break;
         default:                    /* other error (fatal)                  */