Fixing bug: adding null check for column values.