diff -r 597164ed39b7 -r 5fffb5cc1a88 DebugClients/Python/ThreadExtension.py --- a/DebugClients/Python/ThreadExtension.py Sat Feb 25 21:11:54 2017 +0100 +++ b/DebugClients/Python/ThreadExtension.py Sat Feb 25 21:17:56 2017 +0100 @@ -232,7 +232,10 @@ # adjust current frame if "__pypy__" not in sys.builtin_module_names: - self.threads[id].currentFrame = self.getExecutedFrame(frame) + # Don't update with None + currentFrame = self.getExecutedFrame(frame) + if currentFrame is not None: + self.threads[id].currentFrame = currentFrame # Clean up obsolet because terminated threads self.threads = {id_: thrd for id_, thrd in self.threads.items()