Index: trunk/src/event/editor/UnitPanel.java
===================================================================
--- trunk/src/event/editor/UnitPanel.java	(revision 130)
+++ trunk/src/event/editor/UnitPanel.java	(revision 140)
@@ -94,8 +94,11 @@
     public void uponClose()
     {
-        event.unitNum = txtUnitNumber.getText();
-        event.unitActive = ActiveDropdown.getSelectedItem().toString();
-        event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
-        event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        if (event != null)
+        {
+            event.unitNum = txtUnitNumber.getText();
+            event.unitActive = ActiveDropdown.getSelectedItem().toString();
+            event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
+            event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        }
     }