1 files changed, 2 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index b263e339..51b40b2c 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -19,6 +19,7 @@ import Data.Maybe
 import qualified Data.Set            as Set
          ;import Data.Set            (Set)
 import System.IO
+import System.IO.Error
 
 import qualified Data.MinMaxPSQ   as MM
          ;import Data.MinMaxPSQ   (MinMaxPSQ, MinMaxPSQ')
@@ -114,9 +115,7 @@ sendQuery :: forall addr nid tok ni r.
             -> IO ()
 sendQuery Search{..} searchTarget searchResult sch@SearchState{..} (ni :-> d) = do
     myThreadId >>= flip labelThread ("searchQuery." ++ show searchTarget)
-    -- TODO: Should we really be catching ThreadKilled ?
-    reply <- handle (\(SomeException e) -> return Nothing)
-                      (searchQuery searchTarget ni)
+    reply <- searchQuery searchTarget ni `catchIOError` const (return Nothing)
     -- (ns,rs)
     let tok = error "TODO: token"
     atomically $ do