Merge pull request #1166 from goodfeli/master

fix missing space in error message
better error message (and partial code clarification)