diff --git a/src/internal.c b/src/internal.c
index 30ff7718..6ffa1166 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -2531,7 +2531,7 @@ static int DoNewKeys(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
     (void)len;
     (void)idx;
 
-    if (ssh == NULL)
+    if (ssh == NULL || ssh->handshake == NULL)
         ret = WS_BAD_ARGUMENT;
 
     if (ret == WS_SUCCESS) {