Corrected issue where .'row' maybe null.