diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionExecutionData.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionExecutionData.java
index 0497e8395..90b2dddaf 100644
--- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionExecutionData.java
+++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionExecutionData.java
@@ -211,7 +211,12 @@ private Map<String, Value> runJavaAction(Map<String, SerializableSessionObject>
 
         final Serializable exception = returnMap.get(EXCEPTION);
         if (exception != null) {
-            logException(exception.toString());
+            // some java actions contain the exception key without having an actual exception
+            // this is because some actions have the output field named as "errorMessage", others "exception"
+            String exceptionMessage = exception.toString();
+            if (!exceptionMessage.isEmpty()) {
+                logException(exceptionMessage);
+            }
         }
 
         return handleSensitiveValues(returnMap, currentContext);