Merge pull request #2660 from kumpera/loader-error-cleanup6