CC-20 Fixed county and other property of non object issue
Merge pull request #13 from TinyNova/CC-20

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