IDE-281 Debugger crashes after Layout finishes

Fixes IDE-281

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>