diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java
index 71d59b231..9b04ba0bb 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java
@@ -23,7 +23,7 @@ public final class FlightConfigurationID implements Comparable<FlightConfigurati
 	}
 	
 	public FlightConfigurationID(final String _str) {
-		if("".equals(_str)){
+		if(_str == null || "".equals(_str)){
 			this.key = UUID.randomUUID();
 		}else{
 			this.key = UUID.fromString( _str);
diff --git a/core/src/net/sf/openrocket/simulation/SimulationOptions.java b/core/src/net/sf/openrocket/simulation/SimulationOptions.java
index f7167a187..9fc55cf41 100644
--- a/core/src/net/sf/openrocket/simulation/SimulationOptions.java
+++ b/core/src/net/sf/openrocket/simulation/SimulationOptions.java
@@ -51,7 +51,7 @@ public class SimulationOptions implements ChangeSource, Cloneable {
 	protected final Preferences preferences = Application.getPreferences();
 	
 	private final Rocket rocket;
-	private FlightConfigurationID configId = FlightConfigurationID.ERROR_CONFIGURATION_FCID; 
+	private FlightConfigurationID configId = new FlightConfigurationID(); 
 	
 	/*
 	 * NOTE:  When adding/modifying parameters, they must also be added to the
diff --git a/core/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java
index 7ddbccce8..9810bd550 100644
--- a/core/src/net/sf/openrocket/util/TestRockets.java
+++ b/core/src/net/sf/openrocket/util/TestRockets.java
@@ -1156,7 +1156,7 @@ public class TestRockets {
 	public static OpenRocketDocument makeTestRocket_v106_withMotorMountIgnitionConfig() {
 		Rocket rocket = new Rocket();
 		rocket.setName("v106_withwithMotorMountIgnitionConfig");
-		FlightConfigurationID fcid = new FlightConfigurationID("2SecondDelay");
+		FlightConfigurationID fcid = new FlightConfigurationID();
 		
 		// make stage
 		AxialStage stage = new AxialStage();