--- a/DebugClients/Python/DebugBase.py	Sat Jan 09 19:44:31 2016 +0100
+++ b/DebugClients/Python/DebugBase.py	Sun Jan 10 13:55:21 2016 +0100
@@ -610,7 +610,11 @@
         if self._dbgClient.mainFrame is None:
             if fn != self._dbgClient.getRunning():
                 return
-            self._dbgClient.mainFrame = frame
+            fr = frame
+            while (fr is not None and
+                    fr.f_code != self._dbgClient.handleLine.func_code):
+                self._dbgClient.mainFrame = fr
+                fr = fr.f_back
 
         self.currentFrame = frame