CC-20 Fixed county and other property of non object issue