Protect a bit against missing properties. Fixes #51