Move errors to variables so they can be matched against
Merge pull request #38 from BugHerd/var-errors

Move errors to variables so they can be matched against