Cleaned up try/catch blocks