Merge pull request #693 from cabinetoffice/tidying/possible-null-refe…

…rence Remove the warning: "[CS8602] Dereference of a possibly null reference."
cabinetoffice · Oct 2, 2024 · eb6c9a7 · eb6c9a7
2 parents e3c052d + 72987a6
commit eb6c9a7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Frontend/CO.CDP.OrganisationApp/Pages/Forms/FormsQuestionPage.cshtml.cs b/Frontend/CO.CDP.OrganisationApp/Pages/Forms/FormsQuestionPage.cshtml.cs
@@ -172,13 +172,13 @@ public async Task<IEnumerable<AnswerSummary>> GetAnswers()
 
                 var summary = new AnswerSummary
                 {
-                    Title = question.SummaryTitle ?? question.Title,
+                    Title = question?.SummaryTitle ?? question?.Title,
                     Answer = answerString,
                     ChangeLink = $"/organisation/{OrganisationId}/forms/{FormId}/sections/{SectionId}/questions/{answer.QuestionId}?frm-chk-answer=true"
                 };
 
-                if (question.Type == FormQuestionType.Address && answer.Answer?.AddressValue != null
-                    && answer.Answer.AddressValue.Country != Constants.Country.UKCountryCode)
+                if (question?.Type == FormQuestionType.Address && answer.Answer?.AddressValue != null
+                    && answer.Answer.AddressValue.Country != Country.UKCountryCode)
                 {
                     summary.ChangeLink += "&UkOrNonUk=non-uk";
                 }