Remove try/except block