Added null check for column names