Fix 2 for working with non-existent basepaths
Fix 2 for working with non-existent basepaths

GemsTracker/gemstracker-library,GemsTracker/gemstracker-library,GemsTracker/gemstracker-library,GemsTracker/gemstracker-library