Fixed crash on null rows