Removed redundant catch block, added tests to again reach 100% coverage.