Feature/prevent oschdir error