diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index 120603b..59130f0 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -12,6 +12,7 @@
 
 #include <osiSock.h>
 #include <epicsGuard.h>
+#include <epicsAssert.h>
 
 #include <pv/lock.h>
 #include <pv/timer.h>
@@ -105,6 +106,7 @@ public:
         PVStructure::shared_pointer const & pvStructure,
         BitSet::shared_pointer const & existingBitSet)
     {
+        assert(pvStructure);
         int pvStructureSize = pvStructure->getNumberFields();
         if (existingBitSet.get() && static_cast<int32>(existingBitSet->size()) >= pvStructureSize)
         {
diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index b6adda1..d3661b7 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -23,6 +23,7 @@
 
 #include <osiSock.h>
 #include <osiProcess.h>
+#include <epicsAssert.h>
 
 #include <pv/byteBuffer.h>
 #include <pv/timer.h>
@@ -58,6 +59,7 @@ static BitSet::shared_pointer createBitSetFor(
     PVStructure::shared_pointer const & pvStructure,
     BitSet::shared_pointer const & existingBitSet)
 {
+    assert(pvStructure);
     int pvStructureSize = pvStructure->getNumberFields();
     if (existingBitSet.get() && static_cast<int32>(existingBitSet->size()) >= pvStructureSize)
     {