From 547ea457372066456c0efc982eb49cd648b0e2fc Mon Sep 17 00:00:00 2001
From: Ryan Miles <ryanm@rmanet.com>
Date: Thu, 22 Jan 2026 13:49:20 -0800
Subject: [PATCH] Enhance exception handling to include detailed error message
 in system error response

---
 cwms-data-api/src/main/java/cwms/cda/ApiServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java b/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java
index 87c1b1150..2eb6f177a 100644
--- a/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java
+++ b/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java
@@ -381,7 +381,7 @@ public void init() {
                     ctx.status(HttpServletResponse.SC_BAD_REQUEST).json(re);
                 })
                 .exception(Exception.class, (e, ctx) -> {
-                    CdaError errResponse = new CdaError("System Error");
+                    CdaError errResponse = new CdaError("System Error", Map.of("Error message", e.getMessage()));
                     logger.atWarning().withCause(e).log("error on request[%s]: %s",
                             errResponse.getIncidentIdentifier(), ctx.req.getRequestURI());
                     ctx.status(500);