Index: server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java
===================================================================
--- server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java	(revision 615244)
+++ server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java	(working copy)
@@ -62,13 +62,16 @@
 
     
     public void service(Socket socket) throws ServiceException, IOException {
-
         InetAddress client = socket.getInetAddress();
-        org.apache.log4j.MDC.put("HOST", client.getHostName());
-        org.apache.log4j.MDC.put("SERVER", getName());
 
         try {
+            org.apache.log4j.MDC.put("HOST", client.getHostName());
+            org.apache.log4j.MDC.put("SERVER", getName());
+        } catch (Throwable e) {
+        }
 
+        try {
+
 //            logger.info("[request] "+socket.getPort()+" - "+client.getHostName());
             next.service(socket);
 //            logSuccess();
Index: server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
===================================================================
--- server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java	(revision 615244)
+++ server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java	(working copy)
@@ -135,7 +135,7 @@
             org.apache.log4j.MDC.put("SERVER", "main");
             InetAddress localhost = InetAddress.getLocalHost();
             org.apache.log4j.MDC.put("HOST", localhost.getHostName());
-        } catch (Exception e) {
+        } catch (Throwable e) {
         }
 
         ServiceFinder serviceFinder = new ServiceFinder("META-INF/");