Add null check for layout returned from tempstore

Closes #3577871

Merge request reports

Loading