Row logging removed
Nullcheck added