Address fatal errors

Lauri Timmaneerequested to merge
issue/drupal-3394197:3394197-the-new-property into 11.x

Closes #3394197

Merge request reports