diff --git a/src/charon/sa/authenticators/eap_authenticator.c b/src/charon/sa/authenticators/eap_authenticator.c
index 1bd8e7898..2abdf7a02 100644
--- a/src/charon/sa/authenticators/eap_authenticator.c
+++ b/src/charon/sa/authenticators/eap_authenticator.c
@@ -509,7 +509,11 @@ static status_t process_client(private_eap_authenticator_t *this,
 			case EAP_REQUEST:
 			{
 				this->eap_payload = client_process_eap(this, eap_payload);
-				return NEED_MORE;
+				if (this->eap_payload)
+				{
+					return NEED_MORE;
+				}
+				return FAILED;
 			}
 			case EAP_SUCCESS:
 			{