Added in missing folder and exception to add folder if missing