Better null-item check