2 files changed, 9 insertions, 8 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 0345e1ee..569e1d3d 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -23,6 +23,7 @@ import System.IO
 import System.IO.Error
 import Text.PrettyPrint.HughesPJClass
 import Text.Printf
+import Text.Read
 import Control.Monad.Reader.Class
 import System.Posix.Process (getProcessID)
 
@@ -163,11 +164,12 @@ clientSession st signalQuit sock n h = do
                     return $ do
                     hPutClient h $ showReport r
 
-        ("peers", s) -> cmd $ do
-                    let ih = fromString s
-                    ps <- allPeers ih
-                    return $ do
-                    hPutClient h $ showReport $ map (((,) "") . show . pPrint) ps
+        ("peers", s) -> cmd $ case readEither s of
+                        Right ih -> do
+                            ps <- allPeers ih
+                            seq ih $ return $ do
+                            hPutClient h $ showReport $ map (((,) "") . show . pPrint) ps
+                        Left er -> return $ hPutClient h er
 
         ("pid", _) -> cmd $ return $ do
                     pid <- getProcessID
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 47d17622..533068c6 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -231,9 +231,8 @@ refreshNodes nid = do
 
 -- | This operation do not block but acquire exclusive access to
 --   routing table.
-insertNode :: forall ip. Address ip => NodeInfo ip -> Maybe ReflectedIP -> DHT ip ThreadId
-insertNode info witnessed_ip0 = fork $ do
-  -- myThreadId >>= liftIO . flip labelThread "DHT.insertNode"
+insertNode :: forall ip. Address ip => NodeInfo ip -> Maybe ReflectedIP -> DHT ip ()
+insertNode info witnessed_ip0 = do
   var <- asks routingInfo
   tm <- getTimestamp
   let showTable = do