Merge branch 'noExecption'
Merge branch 'master' into noExecption
More updates relating to exception handling