! Hopefully a better worded error (and not logged to the admin panel, isn't really needed)

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1088 from Arantor/release-2.1

! Hopefully a better worded error (and not logged to the admin panel, is...