enhancement: Error handling improvements

Can't show this merge request because the source branch 23-error-handling-improvements is missing from project georgekoltsov-multiple-projects-test-4/imported-project-ef029319134ab099. Close this merge request or update the source branch.