From def3529f12d97ebf084412190baa3e307d7c3e29 Mon Sep 17 00:00:00 2001
From: Marcel <Marcel@helmont.nl>
Date: Thu, 21 Jun 2018 20:05:01 +0200
Subject: [PATCH] simple check for target id if not gotoStartNode

---
 .../mediaPicker/mediapicker.controller.js     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index ccb033a57c..21bb4208bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -82,17 +82,21 @@ angular.module("umbraco")
                     //media object so we need to look it up
                     var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
                     var altText = $scope.target.altText;
-                    mediaResource.getById(id)
-                        .then(function (node) {
-                            $scope.target = node;
-                            if (ensureWithinStartNode(node)) {
-                                selectImage(node);
-                                $scope.target.url = mediaHelper.resolveFile(node);
-                                $scope.target.altText = altText;
-                                $scope.openDetailsDialog();
-                            }
-                        },
-                        gotoStartNode);
+                    if (id) {
+                        mediaResource.getById(id)
+                            .then(function (node) {
+                                $scope.target = node;
+                                if (ensureWithinStartNode(node)) {
+                                    selectImage(node);
+                                    $scope.target.url = mediaHelper.resolveFile(node);
+                                    $scope.target.altText = altText;
+                                    $scope.openDetailsDialog();
+                                }
+                            },
+                                gotoStartNode);
+                    } else {
+                        gotoStartNode();
+                    }
                 }
             }
 
@@ -385,4 +389,4 @@ angular.module("umbraco")
 
             onInit();
 
-        });
\ No newline at end of file
+        });