Deal with bad endpoints