1 files changed, 3 insertions, 2 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