Remove a lot of try/except