From daf7febe7c87ff8ec81927b6d5bb18778afe0ee4 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:30:44 +0800
Subject: [PATCH] Handle ErrorMessage is null.

---
 .../Pages/Account/Error.cshtml.cs                            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/Error.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/Error.cshtml.cs
index bae4eb380e..90622f7dc3 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/Error.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/Error.cshtml.cs
@@ -22,7 +22,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public async Task OnGet(string errorId)
         {
-            ErrorMessage = await _interaction.GetErrorContextAsync(errorId);
+            ErrorMessage = await _interaction.GetErrorContextAsync(errorId) ?? new ErrorMessage
+            {
+                Error = L["Error"]
+            };
 
             if (ErrorMessage != null)
             {