* reapplied my changes after syncing with upstream * fix: changed raw error to sanitized error * fix: added try/catch to create catch
* reapplied my changes after syncing with upstream * fix: changed raw error to sanitized error * fix: added try/catch to create catch