Fix error with Error + small refactoring