diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index 237155d42..d43319345 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -297,10 +297,10 @@ public class ComponentPresetChooserDialog extends JDialog {
 			} catch (java.util.regex.PatternSyntaxException e) {
 			}
 		}
-		if (aftDiameterFilterCheckBox.isSelected()) {
+		if ((null != aftDiameterFilterCheckBox) && aftDiameterFilterCheckBox.isSelected()) {
 			filters.add(aftDiameterFilter);
 		}
-		if (foreDiameterFilterCheckBox.isSelected()) {
+		if ((null != foreDiameterFilterCheckBox) && foreDiameterFilterCheckBox.isSelected()) {
 			filters.add(foreDiameterFilter);
 		}
 		if (!showLegacyCheckBox.isSelected()) {