More exception refactoring.
Merge branch 'master' of https://github.com/sumerjabri/studio3