1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
index c2da8edc2c..48a5a5ce85 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
@@ -36,8 +36,8 @@ namespace sys {
 class ConnectionOutputHandlerPtr : public ConnectionOutputHandler
 {
   public:
-    ConnectionOutputHandlerPtr(ConnectionOutputHandler* p) : next(p) {}
-    void set(ConnectionOutputHandler* p) { next = p; }
+    ConnectionOutputHandlerPtr(ConnectionOutputHandler* p) : next(p) { assert(next); }
+    void set(ConnectionOutputHandler* p) { next = p; assert(next); }
     ConnectionOutputHandler* get() { return next; }
     const ConnectionOutputHandler* get() const { return next; }