Add missing invalid distance check am: dc5d797289 am: 8862923799
am: f26de4ec08

Change-Id: I9c553fb0c98dc26c47308d8d3f79d0ed880866c4