Resolve #3592066 "Fatal error when"

mondrakerequested to merge
issue/sophron-3592066:3592066-fatal-error-when into 2.2.x

Closes #3592066

Merge request reports