Index: hej/net/sf/saxon/expr/instruct/Message.java
===================================================================
--- hej/net/sf/saxon/expr/instruct/Message.java	(revision 988)
+++ hej/net/sf/saxon/expr/instruct/Message.java	(working copy)
@@ -294,12 +294,12 @@
                             "Processing terminated by " + StandardErrorListener.getInstructionName(this) +
                                     " at line " + getLineNumber() +
                                     " in " + StandardErrorListener.abbreviatePath(getSystemId()));
+                    te.setLocator(this);
                     try {
                         String code = errorCode.evaluateAsString(context).toString();
                         StructuredQName errorCode = StructuredQName.fromLexicalQName(
                                     code, false, true, context.getConfiguration().getNameChecker(), nsResolver);
                         te.setErrorCodeQName(errorCode);
-                        te.setLocator(this);
                     } catch (XPathException err) {
                         // no action, ignore the error
                     }