got rid of try/catch mess