Fix exception reference. Kill the terminal.
Fix lint issues and unreachable code
Merge pull request #15914 from s0undt3ch/2014.7

Fixes for #15907