diff --git a/Lib/random.py b/Lib/random.py
index 91065b7..0bc2417 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -242,6 +242,8 @@
                 "enough bits to choose from a population range this large.\n"
                 "To remove the range limitation, add a getrandbits() method.")
             return int(random() * n)
+        if n == 0:
+            raise ValueError("Boundary cannot be zero")
         rem = maxsize % n
         limit = (maxsize - rem) / maxsize   # int(limit * maxsize) % n == 0
         r = random()