diff --git a/src/Handshake/ClientNegotiator.php b/src/Handshake/ClientNegotiator.php
index 8726c8f..70856df 100644
--- a/src/Handshake/ClientNegotiator.php
+++ b/src/Handshake/ClientNegotiator.php
@@ -23,7 +23,7 @@ class ClientNegotiator {
             'Connection'            => 'Upgrade'
           , 'Upgrade'               => 'websocket'
           , 'Sec-WebSocket-Version' => $this->getVersion()
-          , 'User-Agent'            => "RatchetRFC/0.0.0"
+          , 'User-Agent'            => "Ratchet"
         ]);
     }
 
@@ -50,4 +50,4 @@ class ClientNegotiator {
     public function getVersion() {
         return 13;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Messaging/MessageBuffer.php b/src/Messaging/MessageBuffer.php
index fc304b1..d0464e1 100644
--- a/src/Messaging/MessageBuffer.php
+++ b/src/Messaging/MessageBuffer.php
@@ -157,7 +157,7 @@ class MessageBuffer {
                         return $this->newCloseFrame(Frame::CLOSE_BAD_PAYLOAD);
                     }
 
-                    return $this->newCloseFrame(Frame::CLOSE_NORMAL);
+                    return $frame;
                     break;
                 case Frame::OP_PING:
                 case Frame::OP_PONG: