70551632 – Refactoring error handling