Merge branch 'MAGETWO-89372' into MAGETWO-71618-MediaGallery-From-Stage

Author: danmooney2

app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js

@@ -77,18 +77,28 @@ define([
         treeLoaded: function () {
             var path = this.options.currentPath,
                 tree = this.element,
+                lastExistentFolderEl,
 
                 /**
-                 * Recursive open.
+                 * Recursively open folders specified in path array.
                  */
                 recursiveOpen = function () {
-                    var el = $('[data-id="' + path.pop() + '"]');
+                    var folderEl = $('[data-id="' + path.pop() + '"]');
+
+                    // if folder doesn't exist, select the last opened folder
+                    if (!folderEl.length) {
+                        tree.jstree('select_node', lastExistentFolderEl);
+
+                        return;
+                    }
+
+                    lastExistentFolderEl = folderEl;
 
                     if (path.length > 1) {
-                        tree.jstree('open_node', el, recursiveOpen);
+                        tree.jstree('open_node', folderEl, recursiveOpen);
                     } else {
-                        tree.jstree('open_node', el, function () {
-                            tree.jstree('select_node', el);
+                        tree.jstree('open_node', folderEl, function () {
+                            tree.jstree('select_node', folderEl);
                         });
                     }
                 };