Null handling improved