diff --git a/src/m_misc.c b/src/m_misc.c
index 8363e9d17..f2f3bbdf5 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2391,6 +2391,8 @@ int M_PathParts(const char *path)
 	int n;
 	const char *p;
 	const char *t;
+	if (path == NULL)
+		return 0;
 	for (n = 0, p = path ;; ++n)
 	{
 		t = p;
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 9daca99fa..816142d72 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -195,12 +195,9 @@ int main(int argc, char **argv)
 					format, timeinfo);
 		}
 
-		if (logdir)
-		{
-			M_MkdirEachUntil(logfilename,
-					M_PathParts(logdir) - 1,
-					M_PathParts(logfilename) - 1, 0755);
-		}
+		M_MkdirEachUntil(logfilename,
+				M_PathParts(logdir) - 1,
+				M_PathParts(logfilename) - 1, 0755);
 
 #ifdef __unix__
 		logstream = fopen(logfilename, "w");