1d45f6 - Revert previous broken patch for error names, add better fix

Authored and Committed by walters 9 years ago
    - Revert previous broken patch for error names, add better fix
    
        
file modified
+7 -3