diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index b0512c44..7f560ebc 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -501,10 +501,11 @@ Card ranks will be uppercased
         #Some sites don't have a showdown section so we have to figure out if there should be one
         # The logic for a showdown is: at the end of river action there are at least two players in the hand
         # we probably don't need a showdown section in pseudo stars format for our filtering purposes
-        if 'SHOWDOWN' in self.actions:
+        if self.shown:
             print >>fh, _("*** SHOW DOWN ***")
-            #TODO: Complete SHOWDOWN
-
+            for name in self.shown:
+                print >>fh, _("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards[name]['PREFLOP'])))
+                
         # Current PS format has the lines:
         # Uncalled bet ($111.25) returned to s0rrow
         # s0rrow collected $5.15 from side pot
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 23688700..98a96638 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -204,12 +204,17 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
     def processHand(self, handText):
         gametype = self.determineGameType(handText)
         logging.debug("gametype %s" % gametype)
-
-        # See if gametype is supported.
-        type = gametype['type']
-        base = gametype['base']
-        limit = gametype['limitType']
-        l = [type] + [base] + [limit]
+        if gametype is None: 
+            l = None
+            gametype = "unmatched"
+            # TODO: not ideal, just trying to not error.
+            # TODO: Need to count failed hands.
+        else:
+            # See if gametype is supported.
+            type = gametype['type']
+            base = gametype['base']
+            limit = gametype['limitType']
+            l = [type] + [base] + [limit]
         hand = None
         if l in self.readSupportedGames():
             hand = None