adjusting entry to handle null 'contains' checks.