diff --git a/src/config_hooks.c b/src/config_hooks.c
index 8cd6c7fb..08f8b18f 100644
--- a/src/config_hooks.c
+++ b/src/config_hooks.c
@@ -638,7 +638,7 @@ int load_knowntlds(const char* file)
     new_KnownTLDS[new_size] = ".";
     new_size++;
 
-    while (getline(&buffer, &bufsize, fp) > 0) {
+    while (getline(&buffer, &bufsize, fp) > 0 && buffer) {
         for (p = buffer; *p; p++) {
             if (*p == '\r' || *p == '\n') {
                 *p = 0;
diff --git a/src/parse_conf.c b/src/parse_conf.c
index 79a210d8..d22d4f69 100644
--- a/src/parse_conf.c
+++ b/src/parse_conf.c
@@ -1162,7 +1162,7 @@ int parse_conf(const char* file)
     if (!(fp = fopen(file, "r"))) {
         return 1;
     }
-    while ((ret2 = getline(&buffer, &bufsize, fp)) > 0) {
+    while ((ret2 = getline(&buffer, &bufsize, fp)) > 0 && buffer) {
         memset(tokens, 0, sizeof(conf_token_t) * PARSE_MAX_ARGS);
         line++;
         /*