Handle unhandled exceptions, if they occur, to prevent the app from crashing. Removed a few small vestigal peices of code, and verified that the tests are still working correctly.