2 files changed, 7 insertions, 5 deletions

diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index f15a0855..b757aed7 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -189,8 +189,9 @@ sendQuery (Client net d err pending whoami _) meth q addr0 = do
         writeTVar pending tbl'
         return (tid,addr,expiry)
     self <- whoami (Just addr)
-    sendMessage net addr (wrapQuery meth tid self addr q)
-    mres <- timeout expiry $ takeMVar mvar
+    mres <- do sendMessage net addr (wrapQuery meth tid self addr q)
+               timeout expiry $ takeMVar mvar
+            `catchIOError` (\e -> return Nothing)
     case mres of
         Just x -> return $ Just $ unwrapResponse meth x
         Nothing -> do
diff --git a/todo.txt b/todo.txt
index 92da7962..4ec76376 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,7 @@
+kademlia: Search is not working as well as expected.  Fast informants are
+          probably pushing out closer but slow informants for longer-timeout
+          queries like tox onion-routed queries.
+
 ui: Online help.
 
 ui: Explicit routing table node deletion. "forget" command.
@@ -14,9 +18,6 @@ bug: Why does running without -4 (ipv4-only) on an ipv6-disabled computer preven
 kademlia: Give different networks a different minimum count to terminate
           bootstrap.  Imperically, tox4: 6 buckets, tox6: 3 buckets
 
-bug: Unhandled exception: dhtd: Network.Socket.sendTo: does not exist (Network
-     is unreachable
-
 tox: Don't store ourself in the kademlia buckets.
 
 tox: fallback to https://nodes.tox.chat/json