diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 465acadf8..f8d169d38 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -94,6 +94,9 @@ public class Exit extends Task {
      * Set a multiline message.
      */
     public void addText(String msg) {
+        if(message==null) {
+            message="";
+        }
         message += project.replaceProperties(msg);
     }