1 files changed, 3 insertions, 2 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index d1afaa38..6e2ab60b 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -270,12 +270,13 @@ sizeFor _ = size
 
 
 getCryptoMessage :: Word32 -> Get CryptoMessage
-getCryptoMessage seqno = do
+getCryptoMessage seqno = fix $ \stripPadding -> do
         t <- getWord8
         case msgTag t of
+            Just (M Padding) -> stripPadding
             Just (M msg) -> do x <- getPacket seqno
                                return $ Pkt msg ==> x
-            Nothing      -> return $ Pkt Padding ==> Padded mempty
+            Nothing      -> return $ Pkt MESSAGE ==> "Unhandled packet: " <> T.pack (show t) --  $ Pkt Padding ==> Padded mempty
 
 putCryptoMessage :: Word32 -> CryptoMessage -> Put
 putCryptoMessage seqno (Pkt t :=> Identity x) = do