Merge "EditPage: Throw exceptions on false contentModel"