Fixed an issue with an null object in the Grid