Don't try to get entity null or undefined from store

Change-Id: I1ae21cf5f6d33bf6a50737ff00931591812faa3f