Added checks for missing folders