Index: telnetappender.cpp
===================================================================
--- telnetappender.cpp	(revision 582102)
+++ telnetappender.cpp	(working copy)
@@ -79,7 +79,6 @@
         synchronized sync(mutex);
         if (closed) return;
         closed = true;
-        sh.stop();
 
         SocketPtr nullSocket;
         SocketOutputStreamPtr nullStream;
@@ -107,6 +106,8 @@
                 }
         }
 
+        sh.join();
+
         activeConnections = 0;
 }
 
@@ -190,6 +191,10 @@
                 }
         } catch(Exception& e) {
                 LogLog::error(LOG4CXX_STR("Encountered error while in SocketHandler loop."), e);
+
+                if (pThis->closed) {
+                  return NULL;
+                }
         }
     }