FIXED: Various edge cases in the loader that may cause stalling progress at 0%
Merge pull request #678 from Viper-7/master

FIXED: Various edge cases in the loader that may cause stalling progress at 0%