Merge "Avoid segfaults if properties are not initialized"