Merge "Handle exceptions when testing row validity"