More informative error
Merge pull request #1189 from cyisfor/master

More informative error