diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index 1b6597a660..b68aa23d78 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -50,10 +50,10 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                         var obj = JsonConvert.DeserializeObject<JObject>(value);
                         var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
 
-                        foreach (var control in allControls.SelectMany(c => c))
+                        foreach (var control in allControls.SelectMany(c => c).OfType<JObject>())
                         {
                             var controlValue = control["value"];
-                            if (controlValue.Type == JTokenType.String)
+                            if (controlValue?.Type == JTokenType.String)
                             {
                                 control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
                             }
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 085d66f3c6..7e47d0dcd6 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Web.PropertyEditors
 
                             // TODO: If it's not a string, then it's a json formatted value -
                             // we cannot really index this in a smart way since it could be 'anything'
-                            if (controlVal.Type == JTokenType.String)
+                            if (controlVal?.Type == JTokenType.String)
                             {
                                 var str = controlVal.Value<string>();
                                 str = XmlHelper.CouldItBeXml(str) ? str.StripHtml() : str;