diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index f095395f2..0ea083a83 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -280,6 +280,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
             // a flat destination dir, then we need to redefine baseName!
             if (flatDestDir && baseName.length() != 0) {
                 int startName = baseName.lastIndexOf(File.separator);
+                if (startName == -1) {
+                    startName = 0;
+                }
+                
                 int endName   = baseName.length();
                 baseName = baseName.substring(startName, endName);
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
index 3fe6b51b0..dcbe84e7d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
@@ -72,7 +72,7 @@ public class WLRun extends Task {
     static private final String defaultPolicyFile = "weblogic.policy";
 
     /**
-     * The classpath to be used in the weblogic ejbc calls. It must contain the weblogic
+     * The classpath to be used when running the Java VM. It must contain the weblogic
      * classes <b>and</b> the implementation classes of the home and remote interfaces.
      */
     private Path classpath;