diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
index 4e45d9a29..11c991e1f 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
@@ -267,7 +267,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 	}
 
 	public void updateComponentSelection(ListSelectionEvent e) {
-		if (e.getValueIsAdjusting()) {
+		if (e.getValueIsAdjusting() || getSelectedComponents() == null) {
 			return;
 		}
 		List<RocketComponent> components = new ArrayList<>(getSelectedComponents());
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
index 1c3854b45..ccf27e1d1 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
@@ -277,7 +277,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 	}
 
 	public void updateComponentSelection(ListSelectionEvent e) {
-		if (e.getValueIsAdjusting()) {
+		if (e.getValueIsAdjusting() || getSelectedComponents() == null) {
 			return;
 		}
 		List<RocketComponent> components = new ArrayList<>(getSelectedComponents());