diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index be9aed3e7..62ff1e782 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -194,6 +194,9 @@ public class Java extends Task {
                 }
             }
         } catch (BuildException e) {
+            if (e.getLocation() == null && getLocation() != null) {
+                e.setLocation(getLocation());
+            }
             if (failOnError) {
                 throw e;
             } else {
@@ -202,7 +205,7 @@ public class Java extends Task {
             }
         } catch (Throwable t) {
             if (failOnError) {
-                throw new BuildException(t);
+                throw new BuildException(t, getLocation());
             } else {
                 log(t);
                 return 0;