better error message. close #114
merge conflict.
Merge commit 'a84af49b69f6785fd4c125d20ba888db5548fddd'