fix check on undefined entity property
Merge branch 'dev'