Do not check null entities in analytics #1606

Closes #1606 (closed)

There's a few levels we could potentially tackle this at; I went for making the change at this level as I couldn't reproduce it.