Got rid of try/catches