From 1123a5d4ea2f80dff13500eae014e7a08ecd1d61 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Wed, 27 Jul 2022 22:12:10 +0200
Subject: [PATCH] Ignore null stages

---
 .../sf/openrocket/rocketcomponent/FlightConfiguration.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 9ae30ab73..f860d1d77 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -376,7 +376,11 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		
 		for (StageFlags flags : this.stages.values()) {
 			if (flags.active) {
-				activeStages.add( rocket.getStage( flags.stageNumber) );
+				AxialStage stage = rocket.getStage(flags.stageNumber);
+				if (stage == null) {
+					continue;
+				}
+				activeStages.add(stage);
 			}
 		}