Fix row-search error handling.

@sueloverso, would you please review & merge this change when you're happy with it?

Thank you!