Exception improvements.
Merge branch 'master' of https://github.com/preetigupta2000/tm.git