Bugfixes and minor additions (exception-catching)

Current Error: Strange Compiler Issue I Don't Understand
Formatting fixed.