diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlAssertionConsumerServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlAssertionConsumerServlet.java
index e31c09529fc..98cf241ec92 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlAssertionConsumerServlet.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlAssertionConsumerServlet.java
@@ -37,7 +37,7 @@ public class SamlAssertionConsumerServlet extends HttpServlet {
     try {
       handleResponse(req, resp);
     } catch (Exception e) {
-      LOG.error("SamlResponseError :" + e.getMessage());
+      LOG.error("[SamlAssertionConsumerServlet] Exception :" + e.getMessage());
     }
   }
 
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlLoginServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlLoginServlet.java
index 0e8fdaff015..6576a82016f 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlLoginServlet.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlLoginServlet.java
@@ -35,8 +35,10 @@ public class SamlLoginServlet extends HttpServlet {
       auth = new Auth(SamlSettingsHolder.getInstance().getSaml2Settings(), req, resp);
       auth.login(SamlSettingsHolder.getInstance().getRelayState());
     } catch (Exception e) {
-      LOG.error(e.getMessage());
-      resp.getOutputStream().println(e.getMessage());
+      resp.setContentType("text/html; charset=UTF-8");
+      LOG.error("[SamlLoginServlet] Failed in Auth Login : {}", e.getMessage());
+      resp.getOutputStream()
+          .println(String.format("<p> [SamlLoginServlet] Failed in Auth Login : %s </p>", e.getMessage()));
     }
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlMetadataServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlMetadataServlet.java
index efd51f69e34..a698a7a5f2d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlMetadataServlet.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlMetadataServlet.java
@@ -39,6 +39,7 @@ public class SamlMetadataServlet extends HttpServlet {
     } else {
       resp.setContentType("text/html; charset=UTF-8");
       for (String error : errors) {
+        LOG.error("[SamlMetadataServlet] Errors in getting Metadata : {} : Errors : {}", metadata, errors);
         resp.getOutputStream().println("<p>" + error + "</p>");
       }
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/socket/FeedServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/socket/FeedServlet.java
index abb4dd6af2b..a4c002f13b2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/socket/FeedServlet.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/socket/FeedServlet.java
@@ -19,22 +19,29 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @WebServlet("/api/v1/push/feed/*")
 public class FeedServlet extends HttpServlet {
   public FeedServlet() {}
 
   @Override
   protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    WebSocketManager.getInstance()
-        .getEngineIoServer()
-        .handleRequest(
-            new HttpServletRequestWrapper(request) {
-              @Override
-              public boolean isAsyncSupported() {
-                return true;
-              }
-            },
-            response);
+    try {
+      WebSocketManager.getInstance()
+          .getEngineIoServer()
+          .handleRequest(
+              new HttpServletRequestWrapper(request) {
+                @Override
+                public boolean isAsyncSupported() {
+                  return true;
+                }
+              },
+              response);
+    } catch (Exception ex) {
+      LOG.error("[FeedServlet] Error Encountered : {}", ex.getMessage());
+      response.getWriter().println(String.format("[FeedServlet] Error Encountered : %s", ex.getMessage()));
+    }
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/socket/SocketAddressFilter.java b/openmetadata-service/src/main/java/org/openmetadata/service/socket/SocketAddressFilter.java
index 942603bd721..06bf99e34be 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/socket/SocketAddressFilter.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/socket/SocketAddressFilter.java
@@ -22,7 +22,6 @@ import java.util.TreeMap;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
@@ -52,8 +51,7 @@ public class SocketAddressFilter implements Filter {
   public void destroy() {}
 
   @Override
-  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-      throws IOException, ServletException {
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException {
     try {
       HttpServletRequest httpServletRequest = (HttpServletRequest) request;
       Map<String, String> query = ParseQS.decode(httpServletRequest.getQueryString());