diff --git a/getifaddr.c b/getifaddr.c
index 329a96b..f0d3af3 100644
--- a/getifaddr.c
+++ b/getifaddr.c
@@ -322,7 +322,7 @@ reload_ifaces(int force_notify)
 	do {
 		getifaddr(runtime_vars.ifaces[i]);
 		i++;
-	} while (runtime_vars.ifaces[i]);
+	} while (i < MAX_LAN_ADDR && runtime_vars.ifaces[i]);
 
 	for (i = 0; i < n_lan_addr; i++)
 	{
diff --git a/minidlna.c b/minidlna.c
index bfe63a6..85cbd47 100644
--- a/minidlna.c
+++ b/minidlna.c
@@ -554,6 +554,8 @@ init(int argc, char **argv)
 						MAX_LAN_ADDR, word);
 					break;
 				}
+				while (isspace(*word))
+					word++;
 				runtime_vars.ifaces[ifaces++] = word;
 			}
 			break;