Merge pull request #1694 from umbraco/temp-U4-9395

Temp u4 9395

src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

@@ -92,7 +92,12 @@ namespace Umbraco.Web.PropertyEditors
                             //swallow...on purpose, there's a chance that this isn't json and we don't want that to affect 
                             // the website. 
                         }
+                        catch (ArgumentException)
+                        {
+                            //swallow on purpose to prevent this error:
+                            // Can not add Newtonsoft.Json.Linq.JValue to Newtonsoft.Json.Linq.JObject.
 
+                        }
                     }
                 }
             }

src/UmbracoExamine/UmbracoMemberIndexer.cs

@@ -238,7 +238,9 @@ namespace UmbracoExamine
             var fields = base.GetSpecialFieldsToIndex(allValuesForIndexing);
 
             //adds the special path property to the index
-            fields.Add("__key", allValuesForIndexing["__key"]);
+            string valuesForIndexing;
+            if (allValuesForIndexing.TryGetValue("__key", out valuesForIndexing))
+                fields.Add("__key", valuesForIndexing);
 
             return fields;