diff --git a/server/core/dcb.c b/server/core/dcb.c
index 7436bcf96..fbfbdc21c 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -2503,7 +2503,7 @@ dcb_call_callback(DCB *dcb, DCB_REASON reason)
 int
 dcb_isvalid(DCB *dcb)
 {
-    return !dcb->dcb_is_zombie;
+    return dcb && !dcb->dcb_is_zombie;
 }
 
 /**
diff --git a/server/core/session.c b/server/core/session.c
index cb556e215..7648fe45e 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -427,7 +427,7 @@ session_final_free(SESSION *session)
 int
 session_isvalid(SESSION *session)
 {
-    return true;
+    return session != NULL;
 }
 
 /**