Bugfix: row is never null