diff --git a/serial/base/src/main/java/org/switchyard/serial/graph/node/ThrowableNode.java b/serial/base/src/main/java/org/switchyard/serial/graph/node/ThrowableNode.java index 910d76021..a51867ec9 100644 --- a/serial/base/src/main/java/org/switchyard/serial/graph/node/ThrowableNode.java +++ b/serial/base/src/main/java/org/switchyard/serial/graph/node/ThrowableNode.java @@ -177,7 +177,11 @@ private Throwable newThrowable(Class throwableClass, String throwable = Construction.construct(throwableClass, parameterTypes, new Object[]{message}); } } catch (Throwable t) { - throw SerialMessages.MESSAGES.couldNotInstantiateThrowable(throwableClass.getName()); + if (throwableClass == null) { + return SerialMessages.MESSAGES.couldNotInstantiateThrowable("Unknown exception: " + message); + } else { + return SerialMessages.MESSAGES.couldNotInstantiateThrowable(throwableClass.getName() + ": " + message); + } } return throwable; }