diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index be2fe0b0d..d225bfd89 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -297,6 +297,9 @@ public final class StringUtils {
      * @return the joined string
      */
     public static String join(Object[] array, CharSequence separator) {
+        if (array == null) {
+            return "";
+        }
     	return join(Arrays.asList(array), separator);
     }
 
diff --git a/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
index 81ea3c648..8f58cc820 100644
--- a/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
@@ -182,10 +182,15 @@ public class StringUtilsTest {
     }
     
     @Test
-    public void testJoinNullArray() {
+    public void testJoinNullCollection() {
     	assertEquals("", StringUtils.join((Collection<String>)null, ", "));
     }
 
+    @Test
+    public void testJoinNullArray() {
+    	assertEquals("", StringUtils.join((String[])null, ", "));
+    }
+
     @Test
     public void testJoinNullSeparator() {
     	assertEquals("abc", StringUtils.join(Arrays.asList("a", "b", "c"), null));