Need to make sure we always end up with a Cell, even if it's null.

Fixes #4544.