diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c
index 2922a096d..69a5ac0b1 100644
--- a/engine/server/pr_cmds.c
+++ b/engine/server/pr_cmds.c
@@ -5296,7 +5296,6 @@ void PF_infokey (progfuncs_t *prinst, struct globalvars_s *pr_globals)
 	int		e1;
 	char	*value;
 	char	*key;
-	char ov[256];
 
 	e = G_EDICT(prinst, OFS_PARM0);
 	e1 = NUM_FOR_EDICT(prinst, e);
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index 65c2154b4..8dc421d1e 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -1908,23 +1908,21 @@ void SV_BeginDownload_f(void)
 	// MVD hacked junk
 	if (!strncmp(name, "demonum/", 8))
 	{
-		char *mvdname;
+		char *mvdname = SV_MVDNum(atoi(name+8));
 
-		if (ISQ2CLIENT(host_client))
-		{
-			Sys_Printf ("Rejected MVD download to %s (Q2 client)\n", mvdname, host_client->name);
-			ClientReliableWrite_Begin (host_client, svcq2_download, 4);
-			ClientReliableWrite_Short (host_client, -1);
-			ClientReliableWrite_Byte (host_client, 0);
-			return;
-		}
-
-		mvdname = SV_MVDNum(atoi(name+8));
 		if (!mvdname)
 		{
 			SV_ClientPrintf (host_client, PRINT_HIGH, "%s is an invalid MVD demonum.\n", name+8);
 			Sys_Printf ("%s requested invalid demonum %s\n", host_client->name, name+8);
 		}
+		else if (ISQ2CLIENT(host_client))
+		{
+			Sys_Printf ("Rejected MVD download of %s to %s (Q2 client)\n", mvdname, host_client->name);
+			ClientReliableWrite_Begin (host_client, svcq2_download, 4);
+			ClientReliableWrite_Short (host_client, -1);
+			ClientReliableWrite_Byte (host_client, 0);
+			return;
+		}
 		else
 			SV_ClientPrintf (host_client, PRINT_HIGH, "Sending demo %s...\n", mvdname);