1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 45d78c9307..d5b6f5ba8a 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -55,17 +55,18 @@ SessionState::~SessionState() {
     factory.erase(getId());
 }
 
-SessionHandler& SessionState::getHandler() {
-    assert(isAttached());
-    return *handler;
+SessionHandler* SessionState::getHandler() {
+    return handler;
 }
 
 AMQP_ClientProxy& SessionState::getProxy() {
-    return getHandler().getProxy();
+    assert(isAttached());
+    return getHandler()->getProxy();
 }
 
 Connection& SessionState::getConnection() {
-    return getHandler().getConnection();
+    assert(isAttached());
+    return getHandler()->getConnection();
 }
 
 void SessionState::detach() {