Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 130)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 140)
@@ -35,7 +35,7 @@
         event = (CMSEvaluationEvent) sei;
         txtID.setText(event.cmsID);
-        
+
         txtLocation.setText(event.location);
-        
+
         txtMessage.setText("");
         for (int i = 0; i < event.message.size(); i++)
@@ -50,5 +50,5 @@
             }
         }
-        
+
         addButton.addActionListener(new ActionListener()
         {
@@ -82,5 +82,5 @@
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public boolean removeAssociatedEvent()
@@ -94,7 +94,10 @@
     public void uponClose()
     {
-        event.cmsID = txtID.getText();
-        event.location = txtLocation.getText();
-        event.cmsType = TypeDropdown.getSelectedItem().toString();
+        if (event != null)
+        {
+            event.cmsID = txtID.getText();
+            event.location = txtLocation.getText();
+            event.cmsType = TypeDropdown.getSelectedItem().toString();
+        }
     }