better error message
Merge pull request #1543 from goodfeli/master

better error message