diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
index 1f64ed22..9ce9b832 100644
--- a/src/internal/sio_client_impl.cpp
+++ b/src/internal/sio_client_impl.cpp
@@ -273,7 +273,8 @@ namespace sio
     {
         if(ec || m_con.expired())
         {
-            LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl);
+            if (ec != boost::asio::error::operation_aborted)
+                LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl);
             return;
         }
         packet p(packet::frame_ping);
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
index 3dd53dd9..122dc5bd 100644
--- a/src/sio_socket.cpp
+++ b/src/sio_socket.cpp
@@ -316,6 +316,9 @@ namespace sio
     void socket::impl::on_close()
     {
         NULL_GUARD(m_client);
+        sio::client_impl *client = m_client;
+        m_client = NULL;
+
         if(m_connection_timer)
         {
             m_connection_timer->cancel();
@@ -325,9 +328,8 @@ namespace sio
         while (!m_packet_queue.empty()) {
             m_packet_queue.pop();
         }
-        m_client->on_socket_closed(m_nsp);
-        m_client->remove_socket(m_nsp);
-        m_client = NULL;
+        client->on_socket_closed(m_nsp);
+        client->remove_socket(m_nsp);
     }
     
     void socket::impl::on_open()