A bit more bomb-proofing for mis-aligned rows.