diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 6bb8eb1e..588a7d56 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -93,7 +93,6 @@ ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig
   m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
   m_statDataChanged(false), m_startTime(boost::posix_time::second_clock::local_time())
 {
-	m_work.reset(new boost::asio::io_service::work(*m_ioService));
 	m_senderCallback.reset(new ServerSenderCallback(*this));
 	m_sender.reset(new SenderHelper(*m_senderCallback, m_ioService));
 	m_receiver.reset(new ReceiverHelper);
@@ -124,7 +123,6 @@ void
 ServerLobbyThread::SignalTermination()
 {
 	Thread::SignalTermination();
-	m_work.reset();
 	m_ioService->stop();
 }
 
@@ -512,7 +510,16 @@ ServerLobbyThread::Main()
 		// Register all timers.
 		RegisterTimers();
 
-		m_ioService->run();
+		m_work.reset(new boost::asio::io_service::work(*m_ioService));
+		m_ioService->run(); // Will only be aborted asynchronously.
+		m_work.reset();
+
+		// Clear all sessions.
+		m_sessionManager.Clear();
+		m_gameSessionManager.Clear();
+		// Execute remaining ready handlers.
+		m_ioService->reset();
+		m_ioService->poll();
 	} catch (const PokerTHException &e)
 	{
 		GetCallback().SignalNetServerError(e.GetErrorId(), e.GetOsErrorCode());
diff --git a/src/net/common/servermanager.cpp b/src/net/common/servermanager.cpp
index 4fba7fbe..cdef59fb 100644
--- a/src/net/common/servermanager.cpp
+++ b/src/net/common/servermanager.cpp
@@ -270,7 +270,6 @@ ServerManager::RunAll()
 	if (m_ircThread)
 		m_ircThread->Run();
 	GetLobbyThread().Run();
-//	for_each(m_acceptThreadPool.begin(), m_acceptThreadPool.end(), boost::mem_fn(&ServerAcceptThread::Run));
 }
 
 void
diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp
index afbc25b9..33a3c827 100644
--- a/src/net/common/sessionmanager.cpp
+++ b/src/net/common/sessionmanager.cpp
@@ -31,6 +31,7 @@ SessionManager::SessionManager()
 
 SessionManager::~SessionManager()
 {
+	Clear();
 }
 
 bool
@@ -343,8 +344,14 @@ void
 SessionManager::Clear()
 {
 	boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
+	SessionMap::iterator i = m_sessionMap.begin();
+	SessionMap::iterator end = m_sessionMap.end();
 
-	// Sockets will be closed automatically.
+	while (i != end)
+	{
+		i->second.sessionData->GetAsioSocket()->close();
+		++i;
+	}
 	m_sessionMap.clear();
 }