diff --git a/Server/src/org/openas2/processor/receiver/DirectoryPollingModule.java b/Server/src/org/openas2/processor/receiver/DirectoryPollingModule.java
index c0a6577b..e242f6b3 100644
--- a/Server/src/org/openas2/processor/receiver/DirectoryPollingModule.java
+++ b/Server/src/org/openas2/processor/receiver/DirectoryPollingModule.java
@@ -86,9 +86,11 @@ public void poll()
 		} catch (OpenAS2Exception oae)
 		{
 			oae.terminate();
+			forceStop(oae);
 		} catch (Exception e)
 		{
 			new WrappedException(e).terminate();
+			forceStop(e);
 		}
 	}
 
@@ -184,11 +186,6 @@ protected void updateTracking() throws OpenAS2Exception
 					try
 					{
 						processFile(file);
-					} catch (Exception e)
-					{
-						IOUtilOld.handleError(file, errorDir);
-						trackedFiles.remove(fileEntry.getKey());
-						throw new WrappedException(e);
 					} finally
 					{
 						trackedFiles.remove(fileEntry.getKey());
@@ -247,7 +244,7 @@ protected void processFile(File file) throws OpenAS2Exception
 				{
 					Header hd = headersEnum.nextElement();
 					headers  = ";;" + hd.getName() + "::" + hd.getValue();
-
+					
 				}
 
 				logger.trace("Message object in directory polling module. Content-Disposition: " + msg.getContentDisposition()
diff --git a/Server/src/org/openas2/processor/resender/DirectoryResenderModule.java b/Server/src/org/openas2/processor/resender/DirectoryResenderModule.java
index 049d9fad..40c90be9 100644
--- a/Server/src/org/openas2/processor/resender/DirectoryResenderModule.java
+++ b/Server/src/org/openas2/processor/resender/DirectoryResenderModule.java
@@ -33,20 +33,20 @@ public class DirectoryResenderModule extends BaseResenderModule {
 	public static final String PARAM_ERROR_DIRECTORY = "errordir";
     public static final String PARAM_RESEND_DELAY = "resenddelay"; // in seconds
 
-	// TODO Resend set to 15 minutes. Implement a scaling resend time with eventual permanent failure of transmission
+	// TODO Resend set to 15 minutes. Implement a scaling resend time with eventual permanent failure of transmission    
 	public static final long DEFAULT_RESEND_DELAY = 15 * 60 * 1000; // 15 minutes
 
 	private Log logger = LogFactory.getLog(DirectoryResenderModule.class.getSimpleName());
 
-
+	
 	public boolean canHandle(String action, Message msg, Map<Object, Object> options) {
 		return action.equals(ResenderModule.DO_RESEND);
 	}
-
+        
 	public void handle(String action, Message msg, Map<Object, Object> options)
 		throws OpenAS2Exception {
 		ObjectOutputStream oos = null;
-		try {
+		try {                        
 			File resendDir = IOUtilOld.getDirectoryFile(getParameter(PARAM_RESEND_DIRECTORY, true));
 			File resendFile = IOUtilOld.getUnique(resendDir, getFilename());
 			oos = new ObjectOutputStream(new FileOutputStream(resendFile));
@@ -57,7 +57,7 @@ public void handle(String action, Message msg, Map<Object, Object> options)
 			oos.writeObject(method);
 			oos.writeObject(retries);
 			oos.writeObject(msg);
-
+            
             logger.info("message put in resend queue"+msg.getLogMsgID());
             if (logger.isTraceEnabled())
     			try
@@ -68,7 +68,7 @@ public void handle(String action, Message msg, Map<Object, Object> options)
     				{
     					Header hd = headersEnum.nextElement();
     					headers  = ";;" + hd.getName() + "::" + hd.getValue();
-
+    					
     				}
 
     				logger.trace("Message object in resender module for storage. Content-Disposition: " + msg.getContentDisposition()
@@ -91,11 +91,11 @@ public void handle(String action, Message msg, Map<Object, Object> options)
 				{}
 		}
 	}
-
+    
 	public void init(Session session, Map<String,String> options) throws OpenAS2Exception {
 		super.init(session, options);
 		getParameter(PARAM_RESEND_DIRECTORY, true);
-		getParameter(PARAM_ERROR_DIRECTORY, true);
+		getParameter(PARAM_ERROR_DIRECTORY, true);        
 	}
 
 	public void resend() {
@@ -117,10 +117,11 @@ public void resend() {
 			}
 		} catch (OpenAS2Exception oae) {
 			oae.terminate();
+			forceStop(oae);
 		}
 	}
 
-	protected String getFilename() throws InvalidParameterException {
+	protected String getFilename() throws InvalidParameterException {		
         long resendDelay;
         if (getParameter(PARAM_RESEND_DELAY, false) == null) {
             resendDelay = DEFAULT_RESEND_DELAY;
@@ -133,10 +134,10 @@ protected String getFilename() throws InvalidParameterException {
 	}
 
 	protected boolean isTimeToSend(File currentFile) {
-		try {
+		try {			
 			StringTokenizer fileTokens = new StringTokenizer(currentFile.getName(), ".", false);
 
-			Date timestamp = DateUtil.parseDate("MM-dd-yy-HH-mm-ss", fileTokens.nextToken());
+			Date timestamp = DateUtil.parseDate("MM-dd-yy-HH-mm-ss", fileTokens.nextToken());			
 
 			return timestamp.before(new Date());
 		} catch (Exception e) {
@@ -168,7 +169,7 @@ protected void processFile(File file) throws OpenAS2Exception {
 						{
 							Header hd = headersEnum.nextElement();
 							headers  = ";;" + hd.getName() + "::" + hd.getValue();
-
+							
 						}
 
 						logger.trace("Reconstituted Message object in resender. Content-Disposition: " + msg.getContentDisposition()
@@ -181,7 +182,7 @@ protected void processFile(File file) throws OpenAS2Exception {
                 msg.setOption(SenderModule.SOPT_RETRIES, retries);
                 msg.setStatus(Message.MSG_STATUS_MSG_RESEND);
 				getSession().getProcessor().handle(method, msg, msg.getOptions());
-
+                
 				if (!file.delete()) { // Delete the file, sender will re-queue if the transmission fails again
 					throw new OpenAS2Exception("File was successfully sent but not deleted: " +
 						file.getAbsolutePath());