diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js
index 37a25f95f5..42b936f19c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the member picker dialog
 angular.module("umbraco").controller("Umbraco.Dialogs.MemberPickerController",
-    function($scope, eventsService, searchService, $log) {
+    function($scope, eventsService, entityResource, searchService, $log) {
         var dialogOptions = $scope.$parent.dialogOptions;
         $scope.dialogTreeEventHandler = $({});
         $scope.results = [];
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index cde085645e..44be3c39b4 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -226,7 +226,7 @@ namespace Umbraco.Web.Editors
                 {
                     m.AdditionalData["Email"] = results.First(x => x.Id.ToInvariantString() == m.Id.ToString()).Fields["email"];    
                 }
-                if (searchResult.Fields["__key"] != null)
+                if (searchResult.Fields.ContainsKey("__key") && searchResult.Fields["__key"] != null)
                 {
                     Guid key;
                     if (Guid.TryParse(searchResult.Fields["__key"], out key))