Catch case where Described.getPrimaryImage() returns null
Merge branch 'mbst-3790-prototype-images-node' into stage