diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index 406fe086e..ed43acee2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -338,7 +338,8 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase {
 
             // If it's a primitive wrapper then we shouldn't try and put
             // it into the jar, so ignore it.
-            if (!className.startsWith("java.lang")) {
+            if (!className.startsWith("java.") &&
+                !className.startsWith("javax.")) {
                 // Translate periods into path separators, add .class to the
                 // name, create the File object and add it to the Hashtable.
                 className = className.replace('.', File.separatorChar);
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 c052d1fa8..c0c20f0f8 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
@@ -262,10 +262,9 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
            }       
         }
         catch (IOException ioe) {
-            String msg = "IOException while adding entry "
-                         + logicalFilename + " to jarfile from " + inputFile.getPath() + "."
-                         + ioe.getMessage();
-            throw new BuildException(msg, ioe);
+            log("WARNING: IOException while adding entry " + 
+                logicalFilename + " to jarfile from " + inputFile.getPath() + " " + 
+                ioe.getClass().getName() + "-" + ioe.getMessage(), Project.MSG_WARN);
         }
         finally {
             // Close up the file input stream for the class file