src/Umbraco.Infrastructure/Models/RichTextEditorValue.cs

@@ -10,5 +10,5 @@ public class RichTextEditorValue
     public required string Markup { get; set; }
 
     [DataMember(Name = "blocks")]
-    public required RichTextBlockValue? Blocks { get; set; }
+    public RichTextBlockValue? Blocks { get; set; }
 }

src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs

@@ -34,7 +34,7 @@ public AspNetCoreRequestAccessor(
     public string? GetRequestValue(string name) => GetFormValue(name) ?? GetQueryStringValue(name);
 
     /// <inheritdoc />
-    public string? GetQueryStringValue(string name) => _httpContextAccessor.GetRequiredHttpContext().Request.Query[name];
+    public string? GetQueryStringValue(string name) => _httpContextAccessor.HttpContext?.Request.Query[name];
 
     /// <inheritdoc />
     public Uri? GetRequestUrl() => _httpContextAccessor.HttpContext != null
@@ -86,8 +86,8 @@ internal void EnsureApplicationUrl() =>
 
     private string? GetFormValue(string name)
     {
-        HttpRequest request = _httpContextAccessor.GetRequiredHttpContext().Request;
-        if (!request.HasFormContentType)
+        HttpRequest? request = _httpContextAccessor.HttpContext?.Request;
+        if (request?.HasFormContentType is not true)
         {
             return null;
         }

src/Umbraco.Web.UI.Client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "15.2.0-rc",
+	"version": "15.2.2",
 	"type": "module",
 	"exports": {
 		".": null,

tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/RichTextPropertyEditorHelperTests.cs

@@ -94,6 +94,22 @@ public void Can_Parse_JObject()
         });
     }
 
+    [Test]
+    public void Can_Parse_JObject_With_Missing_Blocks()
+    {
+        var input = JsonNode.Parse(""""
+                                   {
+                                    "markup": "<h2>Vælg et af vores mest populære produkter</h2>"
+                                   }
+                                   """");
+
+        var result = RichTextPropertyEditorHelper.TryParseRichTextEditorValue(input, JsonSerializer(), Logger(), out RichTextEditorValue? value);
+        Assert.IsTrue(result);
+        Assert.IsNotNull(value);
+        Assert.AreEqual("<h2>Vælg et af vores mest populære produkter</h2>", value.Markup);
+        Assert.IsNull(value.Blocks);
+    }
+
     [Test]
     public void Can_Parse_Blocks_With_Both_Content_And_Settings()
     {

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "15.2.1",
+  "version": "15.2.2",
   "assemblyVersion": {
     "precision": "build"
   },