diff --git a/GanjooRazor/Areas/Admin/Pages/ModifyPage.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ModifyPage.cshtml.cs
index fce668e8..594830a1 100644
--- a/GanjooRazor/Areas/Admin/Pages/ModifyPage.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ModifyPage.cshtml.cs
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 
 namespace GanjooRazor.Areas.Admin.Pages
 {
+    [IgnoreAntiforgeryToken(Order = 1001)]
     public class ModifyPageModel : PageModel
     {
 
@@ -104,14 +105,8 @@ namespace GanjooRazor.Areas.Admin.Pages
                 if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
                 {
                     var putResponse = await secureClient.PutAsync($"{APIRoot.Url}/api/ganjoor/page/{Request.Query["id"]}", new StringContent(JsonConvert.SerializeObject(ModifyModel), Encoding.UTF8, "application/json"));
-                    if (!putResponse.IsSuccessStatusCode)
-                    {
-                        LastMessage = await putResponse.Content.ReadAsStringAsync();
-                    }
-                    else
-                    {
-                        return Redirect($"/Admin/ModifyPage?id={Request.Query["id"]}&edit=true");
-                    }
+                    putResponse.EnsureSuccessStatusCode();
+                    return Redirect($"/Admin/ModifyPage?id={Request.Query["id"]}&edit=true");
                 }
                 else
                 {
diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
index 0f88d641..d8713d18 100644
--- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
+++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
@@ -67,7 +67,10 @@
         @if (!string.IsNullOrEmpty(Model.LastError))
         {
         <div class="poem">
-            @Model.LastError
+            @if (Model.LastError != null)
+            {
+                @Model.LastError
+            }
         </div>
         }
         else