Added handling to check for null of the cell so we can avoid null pointer error

Reviewer: Tiff Go (post commit)

Issue: none