1 files changed, 5 insertions, 1 deletions

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 234d2ef..8e54127 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -40,7 +40,8 @@ import qualified Data.ByteString            as S (ByteString, breakSubstring,
 import           Data.ByteString.Lazy       (ByteString)
 import qualified Data.ByteString.Lazy       as L (ByteString, concat, empty,
                                                   fromChunks, hGetContents,
-                                                  null, readFile, toChunks)
+                                                  null, readFile, toChunks,
+                                                  toStrict)
 import           Data.Char
 import           Data.Function
 import           Data.List
@@ -118,6 +119,7 @@ import           Transforms
 import           PacketTranscoder
 import           GnuPGAgent
 import           ByteStringUtil
+import           Text.XXD
 
 -- | buildKeyDB
 --
@@ -661,6 +663,8 @@ merge_ db filename qs = foldl mergeit db (zip [0..] qs)
       where
         update Nothing   = Just $ KeyData (mappedPacketWithHint filename p n) [] Map.empty Map.empty
         update (Just kd) = dbInsertPacket kd filename adding
+    mergeit _  (_,(_,_,(UnsupportedPacket tag bytes,_)))
+                           = error $ unlines $ ("Unsupported packet type "++show tag) : xxd 0 (L.toStrict bytes)
     mergeit _  (_,(_,_,p)) = error $ "Unexpected PGP packet 3: "++whatP p
 
     whatP (a,_) = concat . take 1 . words . show $ a