diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java
index 4d8c9ecf3..92a635111 100644
--- a/src/main/org/apache/tools/ant/Target.java
+++ b/src/main/org/apache/tools/ant/Target.java
@@ -144,7 +144,10 @@ public class Target {
 		}
                 catch(RuntimeException exc) {
                     if (exc instanceof BuildException) {
-                        ((BuildException)exc).setLocation(task.getLocation());
+                        BuildException be = (BuildException) exc;
+                        if (be.getLocation() == Location.UNKNOWN_LOCATION) {
+                            be.setLocation(task.getLocation());
+                        }
                     }
                     project.fireTaskFinished(task, exc);
                     throw exc;