diff --git a/src/dh-gex.c b/src/dh-gex.c
index e5bcb48b..f08b3ba3 100644
--- a/src/dh-gex.c
+++ b/src/dh-gex.c
@@ -614,6 +614,9 @@ static SSH_PACKET_CALLBACK(ssh_packet_server_dhgex_request)
     session->dh_handshake_state = DH_STATE_GROUP_SENT;
 
     rc = ssh_packet_send(session);
+    if (rc == SSH_ERROR) {
+        goto error;
+    }
 error:
 
     return SSH_PACKET_USED;