diff --git a/api/src/org/labkey/api/data/triggers/ScriptTrigger.java b/api/src/org/labkey/api/data/triggers/ScriptTrigger.java
index 99c18ca8f31..3b83669bb7f 100644
--- a/api/src/org/labkey/api/data/triggers/ScriptTrigger.java
+++ b/api/src/org/labkey/api/data/triggers/ScriptTrigger.java
@@ -236,7 +236,12 @@ private <T> T _invokeTableScript(Container c, User user, Class<T> resultType, St
             catch (NoSuchMethodException | ScriptException e)
             {
                 String extraErrorMessage = errorDetail.get();
-                throw UnexpectedException.wrap(e, "Script execution failed for " + methodName + "()" + (extraErrorMessage == null ? "" : " " + extraErrorMessage));
+                String message = "Script execution failed for " + methodName + "()";
+                if (e.getMessage() != null)
+                    message += " " + e.getMessage();
+                if (extraErrorMessage != null)
+                    message += " " + extraErrorMessage;
+                throw UnexpectedException.wrap(e, message);
             }
             return null;
         });