1 files changed, 10 insertions, 1 deletions

diff --git a/src/Network/Tox/Session.hs b/src/Network/Tox/Session.hs
index 525338b2..c672087f 100644
--- a/src/Network/Tox/Session.hs
+++ b/src/Network/Tox/Session.hs
@@ -11,6 +11,7 @@ module Network.Tox.Session
 
 import Control.Concurrent.STM
 import Control.Monad
+import Control.Exception
 import Data.Functor.Identity
 import Data.Word
 import Network.Socket         (SockAddr)
@@ -132,7 +133,15 @@ plainHandshakeH sp saddr skey handshake = do
             <- lossless (\cp a -> return $ fmap (,a) $ checkLossless $ runIdentity $ pktData cp)
                         (\seqno p _ -> do
                             y <- encryptPacket sk $ bookKeeping seqno p
-                            return (lossyness (msgID p) == Lossy, y))
+                            return OutgoingInfo
+                                { oIsLossy         = lossyness (msgID p) == Lossy
+                                , oEncoded         = y
+                                , oHandleException = Just $ \e -> do
+                                        dput XUnexpected $ unlines
+                                            [ "<-- " ++ show e
+                                            , "<--   while sending " ++ show (seqno,p) ]
+                                        throwIO e
+                                })
                         ()
                         t
         let _ = t :: TransportA String () (CryptoPacket Identity) (CryptoPacket Encrypted)