diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index d8f21cbc9..72fdacac1 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -305,6 +305,9 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		
 		while (!toProcess.isEmpty()) {
 			RocketComponent comp = toProcess.poll();
+			if (comp == null) {
+				continue;
+			}
 			
 			toReturn.add(comp);
 			for (RocketComponent child : comp.getChildren()) {
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java
index a64c8de5c..4a2e81794 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java
@@ -381,7 +381,7 @@ public class DebugLogDialog extends JDialog {
 		});
 		
 		GUIUtil.setDisposableDialogOptions(this, close);
-		setLocationRelativeTo(null);
+		setLocationRelativeTo(parent);
 		followBox.requestFocus();
 	}
 	
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
index 4e9c4d34f..d51dded35 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
@@ -393,7 +393,7 @@ public class PhotoPanel extends JPanel implements GLEventListener {
 
 		gl.glTranslated(dx - p.getAdvance(), 0, 0);
 
-		if (p.isFlame()) {
+		if (p.isFlame() && configuration.hasMotors()) {
 			convertColor(p.getFlameColor(), color);
 
 			gl.glLightfv(GLLightingFunc.GL_LIGHT2, GLLightingFunc.GL_AMBIENT,