Cleaned up unnecessasry try/catch blocks