--- James/src/java/org/apache/james/mailrepository/AvalonMailRepository.java	Thu Jun 23 20:15:12 2005
+++ James/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
@@ -331,22 +331,13 @@
             try {
                 mc = (MailImpl) or.get(key);
             } catch (RuntimeException re) {
-		if (Error.class.isAssignableFrom(re.getClass()) {
-		    StringBuffer exceptionBuffer =
-			new StringBuffer(128)
-                            .append("Error retrieving mail: ")
-                            .append(re.toString())
-                            .append(", but we won't delete it!");
-		    getLogger().debug(exceptionBuffer.toString());
-		} else {
-		    StringBuffer exceptionBuffer =
-			new StringBuffer(128)
+                StringBuffer exceptionBuffer =
+                    new StringBuffer(128)
                             .append("Exception retrieving mail: ")
                             .append(re.toString())
                             .append(", so we're deleting it... good riddance!");
-		    getLogger().debug(exceptionBuffer.toString());
-		    remove(key);
-		}
+                getLogger().debug(exceptionBuffer.toString());
+                remove(key);
                 return null;
             }
             MimeMessageAvalonSource source = new MimeMessageAvalonSource(sr, destination, key);
--- James/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java	Thu Jun 23 19:58:57 2005
+++ James/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java
@@ -71,8 +71,7 @@
         catch( final Throwable e )
         {
             throw new RuntimeException(
-              "Exception caught while retrieving an object, cause: " + e.toString(),
-	      e );
+              "Exception caught while retrieving an object, cause: " + e.toString() );
         }
     }