FIX: fucking unicode mess exceptions
Merge remote-tracking branch 'ArneBab/files-in-manifest' into arne-merge