Merge pull request #2267 from TheBlueMatt/2023-05-better-scb-err