Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java	(revision 728)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java	(revision 766)
@@ -2,5 +2,4 @@
 
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -174,5 +173,5 @@
                             generateReplayMessage(replayMessageSpec);
                         }
-                        catch (InvalidParameterException e) {
+                        catch (IllegalArgumentException e) {
                             Console.printerrln(e.getMessage());
                             // TODO currentToken.invalidateReplay();
@@ -184,5 +183,5 @@
                             // TODO currentToken.invalidateReplay();
                         }
-                        catch (InvalidParameterException e) {
+                        catch (IllegalArgumentException e) {
                             Console.printerrln(e.getMessage());
                             // TODO currentToken.invalidateReplay();
@@ -242,5 +241,5 @@
                     isMatch = matchMultipleConditions(messageCondition, nextMessageCondition);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.printerrln(e.getMessage());
                 }
@@ -250,5 +249,5 @@
                     isMatch = matchSingleMessage(messageCondition);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.printerrln(e.getMessage());
                 }
@@ -606,5 +605,5 @@
 
             if (seqVar.size() != generatedMessageSeq.size()) {
-                throw new InvalidParameterException
+                throw new IllegalArgumentException
                     ("Failure generating replay sequence for rule " + currentRuleName +
                      ": One or more of the sequence variables used to generate a sequence have " +
@@ -656,5 +655,5 @@
             
             if (seqVar.size() != generatedMessageSeq.size()) {
-                throw new InvalidParameterException
+                throw new IllegalArgumentException
                     ("Failure generating replay sequence for rule " + currentRuleName +
                      ": One or more of the sequence variables used to generate a sequence have " +
@@ -712,5 +711,5 @@
             
             if (seqVar.size() != generatedMessageSeq.size()) {
-                throw new InvalidParameterException
+                throw new IllegalArgumentException
                     ("Failure generating replay sequence for rule " + currentRuleName +
                      ": One or more of the sequence variables used to generate a sequence have " +
@@ -783,15 +782,15 @@
      *            object identifier in the storage
      * @return message retrieved from the storage
-     * @throws InvalidParameterException
+     * @throws IllegalArgumentException
      *             thrown in case of invalid uses of "this" or if no message with the identifier obj
      *             is found in the storage
      */
     private ReplayWindowsMessage getStoredMessageVariable(WindowsMessage currentMessage, String obj)
-        throws InvalidParameterException
+        throws IllegalArgumentException
     {
         ReplayWindowsMessage varMessage = null;
         if (obj.equals("this")) {
             if (currentMessage == null) {
-                throw new InvalidParameterException("Failure obtaining term value for rule " +
+                throw new IllegalArgumentException("Failure obtaining term value for rule " +
                     currentRuleName +
                     ": \"this\" is not a valid name for generating runtime messages.");
@@ -805,5 +804,5 @@
             }
             else {
-                throw new InvalidParameterException("Failure obtaining term value for rule " +
+                throw new IllegalArgumentException("Failure obtaining term value for rule " +
                     currentRuleName + ": No message \"" + obj + "\" stored.");
             }
Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java	(revision 728)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java	(revision 766)
@@ -6,5 +6,4 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.HashMap;
@@ -143,5 +142,5 @@
     public void parseFile(String filename) {
         if (filename == null) {
-            throw new InvalidParameterException("filename must not be null");
+            throw new IllegalArgumentException("filename must not be null");
         }
 
@@ -159,5 +158,5 @@
     public void parseFile(File file) {
         if (file == null) {
-            throw new InvalidParameterException("file must not be null");
+            throw new IllegalArgumentException("file must not be null");
         }
 
@@ -331,5 +330,5 @@
                     sequenceSplitter.addMessage(message);
                 }
-                catch (InvalidParameterException e) {
+                catch (IllegalArgumentException e) {
                     Console.traceln(Level.WARNING, e.getMessage() + " WindowsMessage " + currentMessageType +
                                     " ignored.");
Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java	(revision 728)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertDirToXml.java	(revision 766)
@@ -3,5 +3,4 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.List;
 
@@ -38,5 +37,5 @@
 	public void run(List<Object> parameters) {
 		if (parameters.size() < 2) {
-			throw new InvalidParameterException();
+			throw new IllegalArgumentException();
 		}
 		String path = (String) parameters.get(0);
Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java	(revision 728)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDconvertToXml.java	(revision 766)
@@ -3,5 +3,4 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.InvalidParameterException;
 import java.util.List;
 
@@ -38,5 +37,5 @@
 	public void run(List<Object> parameters) {
 		if (parameters.size() < 2) {
-			throw new InvalidParameterException();
+			throw new IllegalArgumentException();
 		}
 		String source = (String) parameters.get(0);
Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java	(revision 728)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java	(revision 766)
@@ -1,5 +1,4 @@
 package de.ugoe.cs.quest.plugin.mfc.commands;
 
-import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.List;
@@ -53,5 +52,5 @@
         }
         catch (Exception e) {
-            throw new InvalidParameterException();
+            throw new IllegalArgumentException();
         }