Improving error messages. See: websharks/s2member#205