Completed null handling in Cj