Improved outline for erroneous intermediate status where the name of
something could be potentially null, which should not lead to a NPE.
Merge branch 'v0.11.x_bugfix' into v0.11.x