Fix: error message duplication