add check for null property names
Merge branch 'master' into change-id-to-string