Please add null check here and a test to verify it cannot be null