Null checking of cells on addCells
Merge remote-tracking branch 'origin/master'