diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index 457fcf98b..0816cb733 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -371,12 +371,11 @@ public class RuntimeConfigurable implements Serializable {
                     } else  if (getElementTag() == null) {
                         throw be;
                     } else {
-                        be.setMessage(
+                        throw new BuildException(
                             getElementTag()
                             +  " doesn't support the \""
                             + be.getAttribute()
-                            + "\" attribute");
-                        throw be;
+                            + "\" attribute", be);
                     }
                 } catch (BuildException be) {
                     if (name.equals("id")) {
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index 26c0baa4f..19c7607bc 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -342,11 +342,10 @@ public class UnknownElement extends Task {
                         }
                     }
                 } catch (UnsupportedElementException ex) {
-                    ex.setMessage(
+                    throw new BuildException(
                         parentWrapper.getElementTag()
                         + " doesn't support the nested \"" + ex.getElement()
-                        + "\" element.");
-                    throw ex;
+                        + "\" element.", ex);
                 }
             }
         }
diff --git a/src/main/org/apache/tools/ant/UnsupportedAttributeException.java b/src/main/org/apache/tools/ant/UnsupportedAttributeException.java
index 33442a999..e7b49b8b8 100644
--- a/src/main/org/apache/tools/ant/UnsupportedAttributeException.java
+++ b/src/main/org/apache/tools/ant/UnsupportedAttributeException.java
@@ -23,7 +23,6 @@ package org.apache.tools.ant;
  */
 public class UnsupportedAttributeException extends BuildException {
 
-    private String myMessage;
     private String attribute;
 
     /**
@@ -34,7 +33,6 @@ public class UnsupportedAttributeException extends BuildException {
     public UnsupportedAttributeException(String msg, String attribute) {
         super(msg);
         this.attribute = attribute;
-        this.myMessage = msg;
     }
 
     /**
@@ -46,19 +44,4 @@ public class UnsupportedAttributeException extends BuildException {
         return attribute;
     }
 
-    /**
-     * Override throwable#getMessage
-     * @return the message
-     */
-    public String getMessage() {
-        return myMessage;
-    }
-
-    /**
-     * Set the message
-     * @param message a new message
-     */
-    public void setMessage(String message) {
-        this.myMessage = message;
-    }
 }
diff --git a/src/main/org/apache/tools/ant/UnsupportedElementException.java b/src/main/org/apache/tools/ant/UnsupportedElementException.java
index 03161f36c..1352dc31f 100644
--- a/src/main/org/apache/tools/ant/UnsupportedElementException.java
+++ b/src/main/org/apache/tools/ant/UnsupportedElementException.java
@@ -32,7 +32,6 @@ package org.apache.tools.ant;
  */
 public class UnsupportedElementException extends BuildException {
 
-    private String  myMessage = null;
     private String  element;
 
     /**
@@ -53,26 +52,4 @@ public class UnsupportedElementException extends BuildException {
     public String getElement() {
         return element;
     }
-
-    /**
-     * Override throwable#getMessage
-     * @return the message
-     */
-    public String getMessage() {
-        if (myMessage == null) {
-            return super.getMessage();
-        } else {
-            return myMessage;
-        }
-    }
-
-    /**
-     * Set the message (If not set already)
-     * @param message a new message
-     */
-    public void setMessage(String message) {
-        if (this.myMessage == null) {
-            this.myMessage = message;
-        }
-    }
 }