diff --git a/changelog.md b/changelog.md
index ba526534f1..50e5f6f90c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,6 @@
 HEAD
+- Fixes a regression that caused spurious frames following a legitimate close 
+  frames to erroneously trigger handlers. #258
 - Changes default HTTP response error code when no http_handler is defined from
   500/Internal Server Error to 426/Upgrade Required
 - Removes timezone from logger timestamp to work around issues with the Windows
diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
index f479b8e89d..c13e85a951 100644
--- a/websocketpp/impl/connection_impl.hpp
+++ b/websocketpp/impl/connection_impl.hpp
@@ -896,7 +896,10 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
                     "null message from m_processor");
             } else if (!is_control(msg->get_opcode())) {
                 // data message, dispatch to user
-                if (m_message_handler) {
+                if (m_state != session::state::open) {
+                    m_elog.write(log::elevel::warn,
+                        "got non-close data frame in state closing");
+                } else if (m_message_handler) {
                     m_message_handler(m_connection_hdl, msg);
                 }
             } else {
@@ -1637,7 +1640,16 @@ void connection<config>::process_control_frame(typename
     std::stringstream s;
     s << "Control frame received with opcode " << op;
     m_alog.write(log::alevel::control,s.str());
-
+    
+    if (m_state == session::state::closed) {
+        m_elog.write(log::elevel::warn,"got frame in state closed");
+        return;
+    }
+    if (op != frame::opcode::CLOSE && m_state != session::state::open) {
+        m_elog.write(log::elevel::warn,"got non-close frame in state closing");
+        return;
+    }
+    
     if (op == frame::opcode::PING) {
         bool pong = true;