Clean up try/catches