Ranging: added a few more checks.