Fix upgrade 1123 to be more defensive about creating new folder