- Change error message
- Drop unneeded parenthesis
- Fix conflict