Unnecessary throws were removed