Add constants in accordance with 10.1
Add error message