Index: /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java
===================================================================
--- /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 1872)
+++ /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 1873)
@@ -81,5 +81,5 @@
      * </p>
      */
-    private Map<String, String> parameters = new HashMap<String, String>();
+    private Map<String, String> parameters;
 
     /**
@@ -90,5 +90,5 @@
      * </p>
      */
-    private List<IReplayable> replay = new LinkedList<IReplayable>();
+    private List<IReplayable> replay;
 
     /**
@@ -250,4 +250,9 @@
             throw new IllegalArgumentException("replayble must not be null");
         }
+        
+        if (replay == null) {
+            replay = new LinkedList<IReplayable>();
+        }
+        
         replay.add(replayable);
     }
@@ -267,4 +272,9 @@
             throw new IllegalArgumentException("generatedReplaySeq must not be null");
         }
+        
+        if (replay == null) {
+            replay = new LinkedList<IReplayable>();
+        }
+        
         replay.addAll(generatedReplaySeq);
     }
@@ -288,4 +298,8 @@
         }
         
+        if (parameters == null) {
+            parameters = new HashMap<String, String>();
+        }
+        
         if (value == null) {
             parameters.remove(key);
@@ -315,5 +329,10 @@
         }
         
-        return parameters.get(key);
+        if (parameters != null) {
+            return parameters.get(key);
+        }
+        else {
+            return null;
+        }
     }
 
@@ -354,5 +373,10 @@
      */
     public List<IReplayable> getReplayables() {
-        return new LinkedList<IReplayable>(replay);
+        if (replay != null) {
+            return new LinkedList<IReplayable>(replay);
+        }
+        else {
+            return new LinkedList<IReplayable>();
+        }
     }
 }