diff --git a/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
index bcb567da0..6b74c2856 100644
--- a/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
@@ -139,7 +139,9 @@ public abstract class ThrustCurveAPI {
 		
 		for( MotorBurnFile entry : listOfMotors ) {
 			ThrustCurveMotor motor = entry.getThrustCurveMotor();
-			motorsByDesignation.put( motor.getDesignation(), motor);
+			if ( motor != null ) {
+				motorsByDesignation.put( motor.getDesignation(), motor);
+			}
 		}
 		
 		return new ArrayList<ThrustCurveMotor>(motorsByDesignation.values());