Fixes #983 - Avoid potential NPEs when saving structured content and page