issue-3398915-fatal-error-when-editing-node-fixes.

Virendra Singhrequested to merge
issue/auto_entitylabel-3398915:3398915-fatal-error-when into 8.x-3.x

Closes #3398915

Merge request reports