Minor documentation and error reporting improvements
Authored by: bdt-rob 2022-03-12
Parent: [r36]
Child: [r38]
