Fix row-search error handling.

@sueloverso, would you please review & merge this change when you're happy with it?

Thank you!
Yes, that's correct -- row-search is the only real change, the other two files are just to keep them in sync.