Omitted assumed exception and added checks instead of try/excepts