Index: core/src/test/java/org/apache/james/mime4j/MimeIOExceptionTest.java
===================================================================
--- core/src/test/java/org/apache/james/mime4j/MimeIOExceptionTest.java	(revision 782907)
+++ core/src/test/java/org/apache/james/mime4j/MimeIOExceptionTest.java	(working copy)
@@ -26,9 +26,7 @@
     public void testMimeIOExceptionString() {
         MimeIOException e =  new MimeIOException("message");
         assertEquals("message", e.getMessage());
-        assertNotNull(e.getCause());
-        assertTrue(e.getCause() instanceof MimeException);
-        assertEquals("message", e.getCause().getMessage());
+        assertNull(e.getCause());
     }
 
     public void testMimeIOExceptionMimeException() {
Index: core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStreamAdaptor.java
===================================================================
--- core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStreamAdaptor.java	(revision 782907)
+++ core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStreamAdaptor.java	(working copy)
@@ -19,6 +19,7 @@
 
 package org.apache.james.mime4j.io;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@
     }
     
     @Override
-    public int readLine(final ByteArrayBuffer dst) throws IOException {
+    public int readLine(final ByteArrayBuffer dst) throws MimeException, IOException {
         int i;
         if (this.bis != null) {
              i = this.bis.readLine(dst);
@@ -83,7 +84,7 @@
         return i;
     }
 
-    private int doReadLine(final ByteArrayBuffer dst) throws IOException {
+    private int doReadLine(final ByteArrayBuffer dst) throws MimeException, IOException {
         int total = 0;
         int ch;
         while ((ch = in.read()) != -1) {
Index: core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStream.java
===================================================================
--- core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStream.java	(revision 782907)
+++ core/src/main/java/org/apache/james/mime4j/io/LineReaderInputStream.java	(working copy)
@@ -19,6 +19,7 @@
 
 package org.apache.james.mime4j.io;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.FilterInputStream;
@@ -43,6 +44,6 @@
      * 
      * @throws IOException in case of an I/O error.
      */
-    public abstract int readLine(final ByteArrayBuffer dst) throws IOException;
+    public abstract int readLine(final ByteArrayBuffer dst) throws MimeException, IOException;
     
 }
Index: core/src/main/java/org/apache/james/mime4j/io/BufferedLineReaderInputStream.java
===================================================================
--- core/src/main/java/org/apache/james/mime4j/io/BufferedLineReaderInputStream.java	(revision 782907)
+++ core/src/main/java/org/apache/james/mime4j/io/BufferedLineReaderInputStream.java	(working copy)
@@ -19,6 +19,7 @@
 
 package org.apache.james.mime4j.io;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.IOException;
@@ -166,7 +167,7 @@
 
     
     @Override
-    public int readLine(final ByteArrayBuffer dst) throws IOException {
+    public int readLine(final ByteArrayBuffer dst) throws MimeException, IOException {
         if (dst == null) {
             throw new IllegalArgumentException("Buffer may not be null");
         }
Index: core/src/main/java/org/apache/james/mime4j/io/MaxLineLimitException.java
===================================================================
--- core/src/main/java/org/apache/james/mime4j/io/MaxLineLimitException.java	(revision 782907)
+++ core/src/main/java/org/apache/james/mime4j/io/MaxLineLimitException.java	(working copy)
@@ -19,13 +19,13 @@
 
 package org.apache.james.mime4j.io;
 
-import org.apache.james.mime4j.MimeIOException;
+import org.apache.james.mime4j.MimeException;
 
 /**
  * Signals a I/O error due to a line exceeding the limit on the 
  * maximum line length.
  */
-public class MaxLineLimitException extends MimeIOException {
+public class MaxLineLimitException extends MimeException {
     
     private static final long serialVersionUID = 8039001187837730773L;
 
Index: core/src/main/java/org/apache/james/mime4j/MimeIOException.java
===================================================================
--- core/src/main/java/org/apache/james/mime4j/MimeIOException.java	(revision 782907)
+++ core/src/main/java/org/apache/james/mime4j/MimeIOException.java	(working copy)
@@ -34,7 +34,7 @@
      * @param message detail message.
      */
     public MimeIOException(String message) {
-        this(new MimeException(message));
+        super(message);
     }
 
     /**
Index: assemble/pom.xml
===================================================================
--- assemble/pom.xml	(revision 782907)
+++ assemble/pom.xml	(working copy)
@@ -39,7 +39,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-2</version>
         <configuration>
-          <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+          <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
         <executions>