Removed redundant catch block, cleaned whitespace