diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index ac8fc1f2..9f9d009d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -1514,11 +1514,15 @@ class Pot(object):
         commitsall = sorted([(v,k) for (k,v) in self.committed.items() if v >0])
 
         self.pots = []
-        while len(commitsall) > 0:
-            commitslive = [(v,k) for (v,k) in commitsall if k in self.contenders]
-            v1 = commitslive[0][0]
-            self.pots += [sum([min(v,v1) for (v,k) in commitsall])]
-            commitsall = [((v-v1),k) for (v,k) in commitsall if v-v1 >0]
+        try:
+            while len(commitsall) > 0:
+                commitslive = [(v,k) for (v,k) in commitsall if k in self.contenders]
+                v1 = commitslive[0][0]
+                self.pots += [sum([min(v,v1) for (v,k) in commitsall])]
+                commitsall = [((v-v1),k) for (v,k) in commitsall if v-v1 >0]
+        except IndexError, e:
+            log.error(_("Pot.end(): Major failure while calculating pot: '%s'" % e))
+            raise FpdbParseError(_("Pot.end(): Major failure while calculating pot: '%s'" % e))
 
         # TODO: I think rake gets taken out of the pots.
         # so it goes: