Fix a crash when attempting to show error. Thanks IanWood62.
Merge remote-tracking branch 'upstream/master'