am df7436e7: Merge "Avoid segfaults if properties are not initialized"

* commit 'df7436e709035fb6f5667980042848c8b4ca3e79':
  Avoid segfaults if properties are not initialized