Half-assed patch to improve issue identified in #55.

Trying to not do too much work here in advance of v1.4
Merge pull request #59 from randyzwitch/v1_3_3_fix_error_messages

Half-assed patch to improve issue identified in #55.