Don't attempt to write a null message

ndw · Apr 14, 2016 · 20e41ea · 20e41ea
1 parent 3510f54
commit 20e41ea
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/xmlcalabash/runtime/XTry.java b/src/main/java/com/xmlcalabash/runtime/XTry.java
@@ -117,8 +117,8 @@ public void run() throws SaxonApiException {
                 // Hey, no one reported this exception. We better do it.
                 treeWriter.addStartElement(c_error);
 
-                String message = xe.getMessage();
                 StructuredQName qCode = null;
+                String message = xe.getMessage();
 
                 if (xe instanceof XPathException) {
                     XPathException xxx = (XPathException) xe;
@@ -162,6 +162,10 @@ public void run() throws SaxonApiException {
                     }
                 }
 
+                if (message == null) {
+                    message = "";
+                }
+
                 treeWriter.startContent();
                 treeWriter.addText(message);
                 treeWriter.addEndElement();