Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 130)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 140)
@@ -64,7 +64,10 @@
     public void uponClose()
     {
-        event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
-        event.witnessNum = txtPhoneNumber.getText();
-        event.witnessAddress = txtAddress.getText();
+        if (event != null)
+        {
+            event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
+            event.witnessNum = txtPhoneNumber.getText();
+            event.witnessAddress = txtAddress.getText();
+        }
     }
 
