Feature/entities/disk

The error message shouldn't say "image". I will fix this in NetworkFetcher as well.