fixed NPE in Row
wip