Refactoring error handling methods.
Round of error handling refactoring complete. More to do, but is currently working.