Explicit error + refactoring