Merge pull request #1357 from timw4mail/errors

Move errors to views folder