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

This reverts commit 4213b28ada38c2d0770864afd3711679fb3954df.
Fixes #983 - Prevent NPE when adding/update Pages and Structured Content when validating