Improve nearby error handling

Bug: 53342
Change-Id: I7686553a66021ce8e63437521a1b6bdddcc28024
Merge "Improve nearby error handling"