Added None check on entity data