Bug 5359 fixed

Taking into account cases where one of the values is null and the cases where values type differ between two cells.