diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 875ca531d..c0a654a45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -139,10 +139,12 @@ public class Exit extends Task {
             if (message != null && message.trim().length() > 0) {
                 text = message.trim();
             } else {
-                if (!testIfCondition()) {
+                if (ifCondition != null && !"".equals(ifCondition)
+                    && testIfCondition()) {
                     text = "if=" + ifCondition;
                 }
-                if (!testUnlessCondition()) {
+                if (unlessCondition != null && !"".equals(unlessCondition)
+                    && testUnlessCondition()) {
                     if (text == null) {
                         text = "";
                     } else {