Analytics null handling implemented