diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index d8bba581..4ce6db0e 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -113,10 +113,6 @@ IF(WIN32)
     # fix boost thread linkage
     ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 
-    SET(framework_SOURCES ${framework_SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win32window.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win32crashhandler.cpp)
-
     IF(WINDOWS_CONSOLE)
         MESSAGE(STATUS "Windows console: ON")
     ELSE()
@@ -126,11 +122,7 @@ IF(WIN32)
 ELSE()
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -rdynamic")
-
     SET(ADDITIONAL_LIBRARIES X11 dl)
-    SET(framework_SOURCES ${framework_SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/platform/x11window.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/platform/unixcrashhandler.cpp)
 ENDIF()
 
 
diff --git a/src/framework/net/protocol.cpp b/src/framework/net/protocol.cpp
index 7c45d683..5df1ff1a 100644
--- a/src/framework/net/protocol.cpp
+++ b/src/framework/net/protocol.cpp
@@ -32,6 +32,7 @@ Protocol::Protocol()
 
 Protocol::~Protocol()
 {
+    assert(!g_app.isTermianted());
     disconnect();
 }
 
@@ -80,6 +81,9 @@ void Protocol::send(const OutputMessagePtr& outputMessage)
     // send
     if(m_connection)
         m_connection->write(outputMessage->getHeaderBuffer(), outputMessage->getMessageSize());
+
+    // reset message to allow reuse
+    outputMessage->reset();
 }
 
 void Protocol::recv()