Adding final part of the structured error handling