diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
index 38e4ed5e4b..a6559cc0ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -58,7 +58,10 @@ angular.module("umbraco")
 
                         $scope.images = [];
                         $scope.searchTerm = "";
-                        $scope.images = data.items;
+                        if(data.items){
+                             $scope.images = data.items;
+                        }
+                       
 
                         //update the thumbnail property
                         _.each($scope.images, function(img) {
@@ -82,7 +85,7 @@ angular.module("umbraco")
 
 
             $scope.$on('fileuploadstop', function(event, files) {
-                $scope.gotoFolder($scope.options.formData.currentFolder);
+                $scope.gotoFolder($scope.currentFolder);
             });
 
             $scope.clickHandler = function(image, ev, select) {