diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 59cf000a3..a73048476 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -382,10 +382,10 @@ public class BodyTube extends SymmetricComponent implements MotorMount, Coaxial
 			}else if( !this.equals( newMotorInstance.getMount())){
 				throw new BugException(" attempt to add a MotorInstance to a second mount, when it's already owned by another mount!");
 			}
+			this.motors.set(fcid,newMotorInstance);
 		}		
 
 		this.isActingMount=true;
-		this.motors.set(fcid,newMotorInstance);
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
index c5e828188..145731ca3 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
@@ -275,7 +275,7 @@ public class InnerTube extends ThicknessRingComponent implements Clusterable, Ra
 
 	@Override 
 	public void setMotorInstance(final FlightConfigurationID fcid, final MotorInstance newMotorInstance){
-		if((null == newMotorInstance)||(newMotorInstance.equals( MotorInstance.EMPTY_INSTANCE ))){
+		if((null == newMotorInstance)||(newMotorInstance== MotorInstance.EMPTY_INSTANCE )){
 			this.motors.set( fcid, null);
 		}else{
 			if( null == newMotorInstance.getMount()){
@@ -283,10 +283,10 @@ public class InnerTube extends ThicknessRingComponent implements Clusterable, Ra
 			}else if( !this.equals( newMotorInstance.getMount())){
 				throw new BugException(" attempt to add a MotorInstance to a second mount, when it's already owned by another mount!");
 			}
+			this.motors.set(fcid, newMotorInstance);
 		}
 		
 		this.isActingMount = true;
-		this.motors.set(fcid,newMotorInstance);
 	}
 	
 	@Override
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index 9cac11c80..46a4d2e0a 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -54,13 +54,16 @@ import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.border.BevelBorder;
 import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.ChangeEvent;
 import javax.swing.tree.DefaultTreeSelectionModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.aerodynamics.WarningSet;
 import net.sf.openrocket.document.OpenRocketDocument;
@@ -111,9 +114,6 @@ import net.sf.openrocket.util.StateChangeListener;
 import net.sf.openrocket.util.TestRockets;
 import net.sf.openrocket.utils.ComponentPresetEditor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class BasicFrame extends JFrame implements PropertyChangeListener {
 	private static final Logger log = LoggerFactory.getLogger(BasicFrame.class);
 	
@@ -755,6 +755,7 @@ public class BasicFrame extends JFrame implements PropertyChangeListener {
 		//// Debug log
 		item = new JMenuItem(trans.get("main.menu.help.debugLog"));
 		item.setIcon(Icons.HELP_DEBUG_LOG);
+		menu.setMnemonic(KeyEvent.VK_D);
 		item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.debugLog.desc"));
 		item.addActionListener(new ActionListener() {
 			@Override