diff --git a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java
index 576580d1c..d0ca34ef2 100644
--- a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java
+++ b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java
@@ -62,6 +62,7 @@ public class DefaultAppearance {
 	
 	private static Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.jpg");
 	private static Appearance AEROTECH_MOTOR = simple("/datafiles/textures/motors/aerotech.png");
+	private static Appearance KLIMA_MOTOR = simple("/datafiles/textures/motors/klima.jpg");
 	private static Appearance REUSABLE_MOTOR = simpleAlpha(new Color(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png");
 	
 	private static HashMap<Color, Appearance> plastics = new HashMap<Color, Appearance>();
@@ -105,6 +106,9 @@ public class DefaultAppearance {
 			if ("AeroTech".equals(tcm.getManufacturer().getSimpleName())) {
 				return AEROTECH_MOTOR;
 			}
+			if ("Klima".equals(tcm.getManufacturer().getSimpleName())) {
+				return KLIMA_MOTOR;
+			}
 		}
 		return REUSABLE_MOTOR;
 	}
diff --git a/core/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java
index 19de190c3..1acf0a6ae 100644
--- a/core/src/net/sf/openrocket/unit/UnitGroup.java
+++ b/core/src/net/sf/openrocket/unit/UnitGroup.java
@@ -189,6 +189,7 @@ public class UnitGroup {
 		UNITS_VELOCITY.addUnit(new GeneralUnit(1 / 3.6, "km/h"));
 		UNITS_VELOCITY.addUnit(new GeneralUnit(0.3048, "ft/s"));
 		UNITS_VELOCITY.addUnit(new GeneralUnit(0.44704, "mph"));
+		UNITS_VELOCITY.addUnit(new GeneralUnit(0.51444445, "kt"));
 		UNITS_VELOCITY.setDefaultUnit(0);
 		
 		UNITS_WINDSPEED = new UnitGroup();
@@ -196,6 +197,7 @@ public class UnitGroup {
 		UNITS_WINDSPEED.addUnit(new GeneralUnit(1 / 3.6, "km/h"));
 		UNITS_WINDSPEED.addUnit(new GeneralUnit(0.3048, "ft/s"));
 		UNITS_WINDSPEED.addUnit(new GeneralUnit(0.44704, "mph"));
+		UNITS_WINDSPEED.addUnit(new GeneralUnit(0.51444445, "kt"));
 		UNITS_WINDSPEED.setDefaultUnit(0);
 		
 		UNITS_ACCELERATION = new UnitGroup();
diff --git a/swing/resources/datafiles/textures/motors/klima.jpg b/swing/resources/datafiles/textures/motors/klima.jpg
new file mode 100644
index 000000000..c5be2761c
Binary files /dev/null and b/swing/resources/datafiles/textures/motors/klima.jpg differ
diff --git a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java
index a1c54c2f7..f0e937345 100644
--- a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java
+++ b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java
@@ -18,6 +18,9 @@ public class ColumnTable extends JTable {
 				String tip = null;
 				java.awt.Point p = e.getPoint();
 				int index = columnModel.getColumnIndexAtX(p.x);
+				if ( index < 0 ) {
+					return null;
+				}
 				int realIndex = columnModel.getColumn(index).getModelIndex();
 				tip = ((ColumnTableModel) getModel()).getColumn(realIndex).getToolTip();
 				return tip;