diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java
index 72fb93ca2..3a2960a48 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java
@@ -35,6 +35,9 @@ enum ThrustCurveMotorColumns {
 	NAME("TCurveMotorCol.NAME") {
 		@Override
 		public String getValue(ThrustCurveMotorSet m) {
+			if (!(Application.getPreferences() instanceof SwingPreferences)) {
+				return m.getCommonName();
+			}
 			if (((SwingPreferences) Application.getPreferences()).getMotorNameColumn()) {
 				return m.getDesignation();
 			} else {