change error messages
Merge branch 'f-controller-rspecs' of github.com:vinsol/vicinity into f-controller-rspecs