Decided to give in :-) and add a defensive check for "nil" in the
recent patch for a couple of row sort issues; falls under "should
never happen, but just in case".