Cleaned up try/catch clauses