Bugfix: check if we have a cell location before using it.