PEEK-2349 improved error handling

Louis Lu requested to merge louis-lu/peek/community/peek-core-email:peek-2349 into master Apr 11, 2024