Avoid making @aeslaughter angry
closes #2928
Merge pull request #3271 from permcody/auxkernel_better_error

Avoid making @aeslaughter angry
Merge commit '21d0a515594e46e7c9faa341a8de1c556d75f349'