diff --git a/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/ErrorController.java b/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/ErrorController.java
index f834374c..e63f6b9e 100644
--- a/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/ErrorController.java
+++ b/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }
diff --git a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/controller/ErrorController.java b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/controller/ErrorController.java
index ac26410c..16cc4310 100644
--- a/auth-center/src/main/java/com/jmsoftware/authcenter/universal/controller/ErrorController.java
+++ b/auth-center/src/main/java/com/jmsoftware/authcenter/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }
diff --git a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java
index 0d0236eb..6e90a89f 100644
--- a/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java
+++ b/exercise-mis/src/main/java/com/jmsoftware/exercisemis/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }
diff --git a/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java
index 086b4db4..57a546d7 100644
--- a/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java
+++ b/muscle-mis/src/main/java/com/jmsoftware/musclemis/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }
diff --git a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/controller/ErrorController.java b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/controller/ErrorController.java
index b560e6e9..a8ad57d3 100644
--- a/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/controller/ErrorController.java
+++ b/service-registry/src/main/java/com/jmsoftware/serviceregistry/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }
diff --git a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/controller/ErrorController.java b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/controller/ErrorController.java
index ca29faa3..9ca3be42 100644
--- a/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/controller/ErrorController.java
+++ b/spring-boot-admin/src/main/java/com/jmsoftware/springbootadmin/universal/controller/ErrorController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * <h1>ErrorController</h1>
@@ -38,6 +39,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         val httpStatus = getStatus(request);
         val body = getErrorAttributes(request, isIncludeStackTrace(request, MediaType.ALL));
         body.put("message", httpStatus.getReasonPhrase());
+        val optionalTrace = Optional.ofNullable(body.get("trace"));
+        optionalTrace.ifPresent(trace -> {
+            val message = body.get("message");
+            val firstLineOfTrace = trace.toString().split("\\n")[0];
+            val joinedMessage = String.format("%s %s", message, firstLineOfTrace);
+            body.put("message", joinedMessage);
+            body.put("trace", "Trace has been simplified. Refer to 'message'");
+        });
         log.error("Captured HTTP request error. Response body = {}", body);
         return new ResponseEntity<>(body, httpStatus);
     }