Revert return value change when column value is null

Revert return value change when column value is null #323