3049332: Fix PHP error: Call to a member function getEntityTypeId() on null

Carlos Romerorequested to merge
issue/drupal-3049332:feature/3049332-9.5.x into 9.5.x

Merge request reports