1 files changed, 4 insertions, 4 deletions

diff --git a/dht/src/Network/Tox/DHT/Handlers.hs b/dht/src/Network/Tox/DHT/Handlers.hs
index 7806da78..dc4ca5fa 100644
--- a/dht/src/Network/Tox/DHT/Handlers.hs
+++ b/dht/src/Network/Tox/DHT/Handlers.hs
@@ -353,7 +353,7 @@ ping client addr = do
     dput XPing $ show addr ++ " <-- ping"
     reply <- QR.sendQuery client (serializer PingType DHTPing unpong) Ping addr
     dput XPing $ show addr ++ " -pong-> " ++ show reply
-    maybe (return False) (\Pong -> return True) $ join reply
+    maybe (return False) (\Pong -> return True) $ join $ resultToMaybe reply
 
 
 saveCookieKey :: TVar [(SockAddr, (Int, PublicKey))] -> SockAddr -> PublicKey -> STM ()
@@ -396,7 +396,7 @@ cookieRequest crypto client localUserKey addr = do
     reply <- QR.sendQuery client cookieSerializer cookieRequest addr
     runlast
     dput XNetCrypto $ show addr ++ " -cookieResponse-> " ++ show reply
-    return $ join reply
+    return $ join $ resultToMaybe reply
 
 unCookie :: DHTMessage t -> Maybe (t (Cookie Encrypted))
 unCookie (DHTCookie n24 fcookie) = Just fcookie
@@ -415,7 +415,7 @@ getNodes client cbvar nid addr = do
     -- dput XMisc $ show addr ++ " <-- getnodes " ++ show nid
     reply <- QR.sendQuery client (serializer GetNodesType DHTGetNodes unsendNodes) (GetNodes nid) addr
     -- dput XMisc $ show addr ++ " -sendnodes-> " ++ show reply
-    forM_ (join reply) $ \(SendNodes ns) ->
+    forM_ (join $ resultToMaybe reply) $ \(SendNodes ns) ->
         forM_ ns $ \n -> do
             now <- getPOSIXTime
             atomically $ do
@@ -423,7 +423,7 @@ getNodes client cbvar nid addr = do
                 forM_ mcbs $ \cbs -> do
                     forM_ cbs $ \cb -> do
                         rumoredAddress cb now addr (udpNodeInfo n)
-    return $ fmap unwrapNodes $ join reply
+    return $ fmap unwrapNodes $ join $ resultToMaybe reply
 
 getNodesUDP :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[NodeInfo],Maybe ()))
 getNodesUDP client cbvar nid addr = getNodes client cbvar nid (Multi.UDP ==> addr)