Removed unnecessary reference
Added hint for null-ColumnSet