Merge pull request #2158 from TheBlueMatt/2023-04-handle_err_more-check