From f0340c6d630dbf96319648c038e7c9cb0432a3b7 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 15 Jun 2016 09:50:05 +0200
Subject: [PATCH] Rework based on review

CURA-1689
---
 cura/ExtruderManager.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cura/ExtruderManager.py b/cura/ExtruderManager.py
index da5887be61..159db42919 100644
--- a/cura/ExtruderManager.py
+++ b/cura/ExtruderManager.py
@@ -67,12 +67,14 @@ class ExtruderManager(QObject):
         self.activeExtruderChanged.emit()
 
     def getActiveExtruderStack(self):
-        try:
-            return self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getBottom().getId()][str(self._active_extruder_index)]
-        except AttributeError:
-            return None
-        except KeyError:
-            return None
+        global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
+        if global_container_stack:
+            global_definition_container = UM.Application.getInstance().getGlobalContainerStack().getBottom()
+            if global_definition_container:
+                if str(self._active_extruder_index) in self._extruder_trains[global_definition_container.getId()]:
+                    return self._extruder_trains[global_definition_container.getId()][str(self._active_extruder_index)]
+                return self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getBottom().getId()][str(self._active_extruder_index)]
+
 
     ##  Adds all extruders of a specific machine definition to the extruder
     #   manager.