Proper null handling