diff --git a/src/m_random.h b/src/m_random.h
index b5e21c63c..452ef41fc 100644
--- a/src/m_random.h
+++ b/src/m_random.h
@@ -57,7 +57,9 @@ public:
 	// Returns a random number in the range [0,mod)
 	int operator() (int mod)
 	{
-		return GenRand32() % mod;
+		return (0 == mod)
+			? 0
+			: (GenRand32() % mod);
 	}
 
 	// Returns rand# - rand#