Add slightly more specific error messages. Addresses #37