diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
index 8e5fb2ebb..187a996bf 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
@@ -201,6 +201,8 @@ class MotorInformationPanel extends JPanel {
 	}
 	
 	public void clearData() {
+		selectedMotor = null;
+		selectedMotorSet = null;
 		totalImpulseLabel.setText("");
 		totalImpulseLabel.setToolTipText(null);
 		classificationLabel.setText("");
@@ -220,6 +222,11 @@ class MotorInformationPanel extends JPanel {
 	
 	public void updateData( List<ThrustCurveMotor> motors, ThrustCurveMotor selectedMotor ) {
 		
+		if ( selectedMotor == null ) {
+			clearData();
+			return;
+		}
+		
 		this.selectedMotorSet = motors;
 		this.selectedMotor = selectedMotor;