ExitOnError: Doc enhancements missed from prev commit (#1807).