diff --git a/src/v_video.cpp b/src/v_video.cpp
index 761c805d7..1ac815bc5 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -1454,7 +1454,6 @@ bool IVideo::SetResolution (int width, int height, int bits)
 
 CCMD (vid_setmode)
 {
-	bool	goodmode = false;
 	int		width = 0, height = SCREENHEIGHT;
 	int		bits = DisplayBits;
 
@@ -1471,13 +1470,8 @@ CCMD (vid_setmode)
 		}
 	}
 
-	if (width && I_CheckResolution (width, height, bits))
-	{
-		goodmode = true;
-	}
-
-	if (!fullscreen)
-		goodmode = true;
+	const bool goodmode = (width > 0 && height > 0)
+		&& (!fullscreen || (Video != nullptr && I_CheckResolution(width, height, bits)));
 
 	if (goodmode)
 	{