Resolve #3525927 "Handle null source"

Alex Pottrequested to merge
issue/redirect-3525927:3525927-handle-null-source into 8.x-1.x

Closes #3525927

Merge request reports