Issue #3540912 by dotpex: Fatal error on initial setup

Patch by dotpex (https://www.drupal.org/u/dotpex) Co-authored-by: dotpex no-reply@drupal.org

Closes #3540912