3 files changed, 12 insertions, 4 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index d1451ff12..58d47c472 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -1426,7 +1426,7 @@ POP_WARNINGS
 #define CATCH_ENTRY_L4(lacation, return_val) CATCH_ENTRY(lacation, return_val)
 
 
-#define ASSERT_MES_AND_THROW(message) {LOG_ERROR(message); std::stringstream ss; ss << message; throw std::runtime_error(ss.str());}
+#define ASSERT_MES_AND_THROW(message) {LOG_ERROR(message); std::stringstream ss; ss << message; throw tools::runtime_error(ss.str());}
 #define CHECK_AND_ASSERT_THROW_MES(expr, message) {if(!(expr)) ASSERT_MES_AND_THROW(message);}
 
 
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 698e1947a..2f6e52a5b 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -777,7 +777,7 @@ POP_WARNINGS
   {
     m_thread_name_prefix = prefix_name;
 		auto it = server_type_map.find(m_thread_name_prefix);
-		if (it==server_type_map.end()) throw std::runtime_error("Unknown prefix/server type:" + std::string(prefix_name));
+		if (it==server_type_map.end()) throw tools::runtime_error("Unknown prefix/server type:" + std::string(prefix_name));
     auto connection_type = it->second; // the value of type
     _info_c("net/RPClog", "Set server type to: " << connection_type << " from name: " << m_thread_name_prefix);
     _info_c("net/RPClog", "prefix_name = " << prefix_name);
@@ -1005,6 +1005,12 @@ POP_WARNINGS
     while(local_shared_context->ec == boost::asio::error::would_block)
     {
       bool r = local_shared_context->cond.timed_wait(lock, boost::get_system_time() + boost::posix_time::milliseconds(conn_timeout));
+      if (m_stop_signal_sent)
+      {
+        if (sock_.is_open())
+          sock_.close();
+        return false;
+      }
       if(local_shared_context->ec == boost::asio::error::would_block && !r)
       {
         //timeout
@@ -1018,6 +1024,8 @@ POP_WARNINGS
     if (ec || !sock_.is_open())
     {
       _dbg3("Some problems at connect, message: " << ec.message());
+      if (sock_.is_open())
+        sock_.close();
       return false;
     }
 
diff --git a/contrib/epee/include/storages/portable_storage_from_bin.h b/contrib/epee/include/storages/portable_storage_from_bin.h
index bc2fb1463..4cb2003e0 100644
--- a/contrib/epee/include/storages/portable_storage_from_bin.h
+++ b/contrib/epee/include/storages/portable_storage_from_bin.h
@@ -84,9 +84,9 @@ namespace epee
     inline throwable_buffer_reader::throwable_buffer_reader(const void* ptr, size_t sz)
     {
       if(!ptr) 
-        throw std::runtime_error("throwable_buffer_reader: ptr==nullptr");
+        throw tools::runtime_error("throwable_buffer_reader: ptr==nullptr");
       if(!sz)
-        throw std::runtime_error("throwable_buffer_reader: sz==0");
+        throw tools::runtime_error("throwable_buffer_reader: sz==0");
       m_ptr = (uint8_t*)ptr;
       m_count = sz;
       m_recursion_count = 0;