fixed regression for better error messages
Merge branch 'master' of https://github.com/appersonlabs/docker.io into merged