1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp
index 53a01141c1..fb84be7cd6 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/cpp/src/qpid/framing/BodyHandler.cpp
@@ -18,14 +18,13 @@
  * under the License.
  *
  */
-#include "qpid/QpidError.h"
 #include "BodyHandler.h"
 #include "AMQMethodBody.h"
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-
 #include <boost/cast.hpp>
+#include "qpid/framing/reply_exceptions.h"
 
 using namespace qpid::framing;
 using namespace boost;
@@ -49,7 +48,8 @@ void BodyHandler::handleBody(AMQBody* body) {
 	handleHeartbeat(polymorphic_downcast<AMQHeartbeatBody*>(body));
 	break;
       default:
-        QPID_ERROR(PROTOCOL_ERROR, "Unknown frame type "+body->type());
+	throw SyntaxErrorException(
+            QPID_MSG("Invalid frame type " << body->type()));
     }
 }