diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
index 966146859..1963fc2f9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
@@ -22,6 +22,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.jlink;
 
+import org.apache.tools.ant.util.FileUtils;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -180,13 +182,7 @@ public class jlink {
                 addFile(output, f, "", compression);
             }
         }
-        if (output != null) {
-            try {
-                output.close();
-            } catch (IOException ioe) {
-                //do nothing
-            }
-        }
+        FileUtils.close(output);
     }
 
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
index 6f067717b..1f5d0432e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
@@ -58,7 +58,11 @@ public class JUnitVersionHelper {
      * @return the name of the test.
      */
     public static String getTestCaseName(Test t) {
-        if (t != null && t.getClass().getName().equals("junit.framework.JUnit4TestCaseFacade")) {
+        if (t == null)
+        {
+            return "unknown";
+        }
+        if (t.getClass().getName().equals("junit.framework.JUnit4TestCaseFacade")) {
             // Self-describing as of JUnit 4 (#38811). But trim "(ClassName)".
             String name = t.toString();
             if (name.endsWith(")")) {