fix error message
remove redundant catch blocks