Handling null fields