Error reporting improved

1 files changed, 3 insertions, 1 deletions

diff --git a/dealconvert/formats/rzd.py b/dealconvert/formats/rzd.py
index 8ca1e97..93dbc45 100644
--- a/dealconvert/formats/rzd.py
+++ b/dealconvert/formats/rzd.py
@@ -51,11 +51,13 @@ class RZDFormat(DealFormat):
                     try:
                         idx = self.cards.index(card)
                     except ValueError:
-                        raise RuntimeError('invalid card: %s' % (card))
+                        raise RuntimeError('invalid card: %s in board %d' % (card, deal.number))
                     values[idx*4+suit] = (i + offset)%4
         for i in range(0, 13):
             byte = 0
             for j in range(0, 4):
+                if values[4*i+j] is None:
+                    raise RuntimeError('missing card: %s%s in board %d' % ('SHDC'[j], self.cards[i], deal.number))
                 byte *= 4
                 byte += values[4*i+j]
             value += chr(byte)