Basic update to exception handling
Merge branch 'master' of https://github.com/RnD-Studios/3a09310a591d8e0bf07084e93f5bf1d3f7a4ea09a5cd4076abf497bbbbc32c2e.git