diff --git a/core/src/net/sf/openrocket/rocketcomponent/DeploymentConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/DeploymentConfiguration.java
index 3a21493f4..62adb9c67 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/DeploymentConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/DeploymentConfiguration.java
@@ -41,7 +41,7 @@ public class DeploymentConfiguration implements FlightConfigurableParameter<Depl
 			@SuppressWarnings("unchecked")
 			@Override
 			public boolean isActivationEvent(DeploymentConfiguration config, FlightEvent e, RocketComponent source) {
-				if (e.getType() != FlightEvent.Type.ALTITUDE)
+				if ((e.getType() != FlightEvent.Type.ALTITUDE) || (e.getData() == null))
 					return false;
 				
 				double alt = config.deployAltitude;
@@ -210,4 +210,4 @@ public class DeploymentConfiguration implements FlightConfigurableParameter<Depl
 	public List<DeploymentConfiguration> getConfigListeners() {
 		return configListeners;
 	}
-}
\ No newline at end of file
+}
diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index 9b823ff62..d169c9595 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -423,7 +423,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
 				ThrustCurveMotor motor = (ThrustCurveMotor) motorState.getMotor();
 				double[] timePoints = motor.getTimePoints();
 				for (double point : timePoints) {
-					currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, point, event.getSource(), motorState));
+					currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, point, event.getSource(), null));
 				}
 
 				// and queue up the burnout for this motor, as well.