diff --git a/controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java b/controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java
index 8516e18a7d4..42144d659ed 100644
--- a/controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java
+++ b/controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java
@@ -1072,7 +1072,11 @@ private void executeStep(final Step step) {
             }
         } catch (Throwable t) {
             // Handling for throwables that don't implement OperationClientException marker interface
-            MGMT_OP_LOGGER.operationFailed(t, step.operation.get(OP), step.operation.get(OP_ADDR));
+            if (!step.requiresDoneStage && !isExternalClient()) {
+                logStepFailure(step, false);
+            } else {
+                MGMT_OP_LOGGER.operationFailed(t, step.operation.get(OP), step.operation.get(OP_ADDR));
+            }
 
             // Provide a failure description if there isn't one already
             if (!step.hasFailed()) {