Fix Refactoring to use Loaders fixes #2570
stability issues and errorhandling
Merge pull request #2575 from Portree-Kid/master-master

Fix Refactoring to use Loaders fixes #2570