diff --git a/src/etc/testcases/taskdefs/concat.xml b/src/etc/testcases/taskdefs/concat.xml
index 029ec0cbf..811ccd84d 100644
--- a/src/etc/testcases/taskdefs/concat.xml
+++ b/src/etc/testcases/taskdefs/concat.xml
@@ -35,7 +35,9 @@
     <concat destfile="TESTDEST" append="true">
       <filelist dir="${basedir}" files="thisfiledoesnotexist"/>
     </concat>
-    <delete file="TESTDEST"/>
+    <available file="TESTDEST" property="TESTDEST.was.created"/>
+    <fail message="TESTDEST created for nonexistant files"
+          if="TESTDEST.was.created"/>
   </target>
 
 </project>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index fcf90b23d..ced15d928 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Concat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java
@@ -266,6 +266,9 @@ public class Concat extends Task {
                 // Concatenate the files.
                 if (srcFiles != null) {
                     catFiles(fileSetBase, srcFiles);
+                } else {
+                    log("Warning: Concat received empty fileset.", 
+                        Project.MSG_WARN);
                 }
             }
         } finally {
@@ -317,6 +320,12 @@ public class Concat extends Task {
         }
 
         final int len = inputFileNames.size();
+        if (len == 0) {
+            log("Warning: Could not find any of the files specified " +
+                "in concat task.", Project.MSG_WARN);
+            return;
+        }
+
         String[] input = new String[len];
         inputFileNames.copyInto(input);