Better error reporting...
Do not try to read if there are no files
Merge branch 'master' of github.com:adept-dm/adept