diff --git a/src/agent.c b/src/agent.c
index 79a9390b..0d030704 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -1701,6 +1701,11 @@ int wolfSSH_AGENT_worker(WOLFSSH* ssh)
     if (ssh == NULL)
         ret = WS_SSH_NULL_E;
 
+    if (ret == WS_SUCCESS) {
+        if (ssh->agent == NULL)
+            ret = WS_AGENT_NULL_E;
+    }
+
     if (ret == WS_SUCCESS) {
         SendSuccess(NULL);
         DoMessage(NULL, NULL, 0, NULL);