Changed error message text
Added Controller and specs. Refactored other things