Merge pull request #2209 from TheBlueMatt/2023-04-better-discon-err-msg