diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs
index 3a07421b9b..6df5860e9b 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/ComponentQuestionBusiness.cs
@@ -202,7 +202,7 @@ public async Task<QuestionResponse> GetResponseAsync()
                 _subCatAnswersByHeadingId = SubCatAnswers
                     .Where(x => x.HeadingId > 0)
                     .GroupBy(x => x.HeadingId)
-                    .ToDictionary(g => g.Key, g => g.First());
+                    .ToDictionary(g => g.Key, g => g.FirstOrDefault());
             }
 
             AddResponse(resp, list2, "Component Defaults");
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs
index 04ce2af599..d31636bfdd 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/QuestionsController.cs
@@ -116,10 +116,19 @@ public IActionResult GetList([FromQuery] string group)
         [Route("api/ComponentQuestionList")]
         public async Task<IActionResult> GetComponentQuestionsList()
         {
-            var manager = new ComponentQuestionBusiness(_context, _assessmentUtil, _token, _questionRequirement);
-            QuestionResponse resp = await manager.GetResponseAsync();
+            try
+            {
+                var manager = new ComponentQuestionBusiness(_context, _assessmentUtil, _token, _questionRequirement);
+                QuestionResponse resp = await manager.GetResponseAsync();
+
+                return Ok(resp);
+            }
+            catch (Exception exc)
+            {
+                LogManager.GetCurrentClassLogger().Error(exc);
+                return BadRequest(exc.Message);
+            }            
 
-            return Ok(resp);
         }