diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index 8f5b1bbbf..9efa3675e 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -238,6 +238,10 @@ public class ComponentPresetChooserDialog extends JDialog {
 		if (!okClicked)
 			return null;
 		int row = componentSelectionTable.getSelectedRow();
+		if ( row < 0 ) {
+			// Nothing selected.
+			return null;
+		}
 		row = componentSelectionTable.convertRowIndexToModel(row);
 		return presets.get(row);
 	}