diff --git a/src/y_inter.c b/src/y_inter.c
index ed651ce3..d2fe08e9 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -2192,6 +2192,9 @@ void Y_VoteDrawer(void)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
+		if (dedicated && i == 0) // While leaving blank spots for non-existent players is largely intentional, the first spot *always* being blank looks a tad silly :V
+			continue;
+
 		if ((playeringame[i] && !players[i].spectator) && votes[i] != -1)
 		{
 			patch_t *pic;
@@ -2298,6 +2301,13 @@ void Y_VoteTicker(void)
 				numvotes++;
 			}
 
+			if (numvotes < 1) // Whoops! Get outta here.
+			{
+				Y_UnloadVoteData();
+				Y_FollowIntermission();
+				return;
+			}
+
 			voteclient.rtics--;
 
 			if (voteclient.rtics <= 0)