diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index 707bf8b9..373a4464 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -99,6 +99,9 @@ public:
 
             if (ei->q->needsNoResponse(status)) {
                 // keep state
+            } else if (status == GPGME_STATUS_ERROR) {
+                err = ei->q->parseStatusError(args);
+                ei->state = EditInteractor::ErrorState;
             } else {
                 ei->state = ei->q->nextState(status, args, err);
             }
diff --git a/lang/cpp/src/gpgrevokekeyeditinteractor.cpp b/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
index fd584099..fda70f24 100644
--- a/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
+++ b/lang/cpp/src/gpgrevokekeyeditinteractor.cpp
@@ -112,10 +112,6 @@ unsigned int GpgRevokeKeyEditInteractor::Private::nextState(unsigned int status,
 
     static const Error GENERAL_ERROR = Error::fromCode(GPG_ERR_GENERAL);
 
-    if (status == GPGME_STATUS_ERROR) {
-        err = q->parseStatusError(args);
-        return ERROR;
-    }
     switch (const auto state = q->state()) {
     case START:
         if (status == GPGME_STATUS_GET_LINE &&