diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index 278d786ad..ea0502722 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -197,6 +197,8 @@ public class ExecTask extends Task {
                 return new PumpStreamHandler(fos);
             } catch (FileNotFoundException fne) {
                 throw new BuildException("Cannot write to "+out, fne, location);
+            } catch (IOException ioe) {
+                throw new BuildException("Cannot write to "+out, ioe, location);
             }
         } else {
             return new LogStreamHandler(this,
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 371eb4a77..8b63b2b50 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -158,13 +158,13 @@ public class JavaCC extends Task {
                 }
             } finally {
                 if (cleanupHack) {
-                    final File oo393 = new File(javaFile.getParentFile(),
+                    final File oo393 = new File(javaFile.getParent(),
                                                 "OO393.class");
                     if (oo393.exists()) {
                         project.log("Removing stale file: " + oo393.getName());
                         oo393.delete();
                     }
-                    final File sunjj = new File(javaFile.getParentFile(),
+                    final File sunjj = new File(javaFile.getParent(),
                                                 "__jj" + javaFile.getName().substring(0,
                                                                                       javaFile.getName().indexOf(".java")) + ".sunjj");
                     if (sunjj.exists()) {