Refactor loader so it does not attempt to load if not detected