Index: src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java	(working copy)
@@ -54,11 +54,11 @@
         }
         catch( NamingException e )
         {
-            String msg = "failed to delete entry " + req.getName() + ":\n";
+            String msg = "failed to delete entry " + req.getName();
 
             if ( LOG.isDebugEnabled() )
             {
-                msg += ExceptionUtils.getStackTrace( e );
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
             }
 
             ResultCodeEnum code;
Index: src/main/java/org/apache/ldap/server/protocol/SearchHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/SearchHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/SearchHandler.java	(working copy)
@@ -44,6 +44,7 @@
 import org.apache.ldap.common.util.ExceptionUtils;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.handler.MessageHandler;
+import org.apache.log4j.Logger;
 
 /**
  * A handler for processing search requests.
@@ -53,6 +54,8 @@
  */
 public class SearchHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( SearchHandler.class );
+    
     private static final String DEREFALIASES_KEY = "java.naming.ldap.derefAliases";
 
 
@@ -162,9 +165,12 @@
         }
         catch( NamingException e )
         {
-            String msg = "failed on search operation:\n" + req + "\n";
+            String msg = "failed on search operation";
 
-            msg += ExceptionUtils.getStackTrace( e );
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + req + ":\n" + ExceptionUtils.getStackTrace( e );
+            }
 
             SearchResponseDone resp = new SearchResponseDoneImpl( req.getMessageId() );
 
@@ -206,9 +212,12 @@
 
     SearchResponseDone getResponse( SearchRequest req, NamingException e )
     {
-        String msg = "failed on search operation:\n" + req + "\n";
+        String msg = "failed on search operation";
 
-        msg += ExceptionUtils.getStackTrace( e );
+        if ( LOG.isDebugEnabled() )
+        {
+            msg += ":\n" + req + ":\n" + ExceptionUtils.getStackTrace( e );
+        }
 
         SearchResponseDone resp = new SearchResponseDoneImpl( req.getMessageId() );
 
Index: src/main/java/org/apache/ldap/server/protocol/CompareHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/CompareHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/CompareHandler.java	(working copy)
@@ -30,6 +30,7 @@
 import org.apache.ldap.common.util.ExceptionUtils;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.handler.MessageHandler;
+import org.apache.log4j.Logger;
 
 
 /**
@@ -40,6 +41,8 @@
  */
 public class CompareHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( CompareHandler.class );
+
     public void messageReceived( ProtocolSession session, Object request )
     {
         CompareRequest req = ( CompareRequest ) request;
@@ -69,9 +72,12 @@
         }
         catch ( NamingException e )
         {
-            String msg = "failed to add entry " + req.getName() + ":\n";
+            String msg = "failed to compare entry " + req.getName();
 
-            msg += ExceptionUtils.getStackTrace( e );
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+            }
 
             ResultCodeEnum code;
 
Index: src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java	(working copy)
@@ -30,6 +30,7 @@
 import org.apache.ldap.common.util.ExceptionUtils;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.handler.MessageHandler;
+import org.apache.log4j.Logger;
 
 
 /**
@@ -40,6 +41,8 @@
  */
 public class ModifyHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( ModifyHandler.class );
+
     private static final ModificationItem[] EMPTY = new ModificationItem[0];
 
     public void messageReceived( ProtocolSession session, Object request )
@@ -60,10 +63,13 @@
         }
         catch ( NamingException e )
         {
-            String msg = "failed to add entry " + req.getName() + ":\n";
+            String msg = "failed to modify entry " + req.getName();
+	    
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+            }
 
-            msg += ExceptionUtils.getStackTrace( e );
-
             ResultCodeEnum code;
 
             if ( e instanceof LdapException )
Index: src/main/java/org/apache/ldap/server/protocol/AddHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/AddHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/AddHandler.java	(working copy)
@@ -28,6 +28,7 @@
 import org.apache.ldap.common.util.ExceptionUtils;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.handler.MessageHandler;
+import org.apache.log4j.Logger;
 
 /**
  * A single reply handler for {@link org.apache.ldap.common.message.AddRequest}s.
@@ -37,6 +38,8 @@
  */
 public class AddHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( AddHandler.class );
+
     public void messageReceived( ProtocolSession session, Object request )
     {
         AddRequest req = ( AddRequest ) request;
@@ -53,9 +56,12 @@
         }
         catch( NamingException e )
         {
-            String msg = "failed to add entry " + req.getName() + ":\n";
+            String msg = "failed to add entry " + req.getName();
 
-            msg += ExceptionUtils.getStackTrace( e );
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+            }
 
             ResultCodeEnum code;
 
Index: src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java	(working copy)
@@ -30,6 +30,7 @@
 import org.apache.ldap.common.util.ExceptionUtils;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.handler.MessageHandler;
+import org.apache.log4j.Logger;
 
 
 /**
@@ -40,6 +41,8 @@
  */
 public class ModifyDnHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( ModifyDnHandler.class );
+
     public void messageReceived( ProtocolSession session, Object request )
     {
         ModifyDnRequest req = ( ModifyDnRequest ) request;
@@ -86,9 +89,12 @@
         }
         catch ( NamingException e )
         {
-            String msg = "failed to add entry " + req.getName() + ":\n";
+            String msg = "failed to modify DN of entry " + req.getName();
 
-            msg += ExceptionUtils.getStackTrace( e );
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+            }
 
             ResultCodeEnum code;
 
Index: src/main/java/org/apache/ldap/server/protocol/BindHandler.java
===================================================================
--- src/main/java/org/apache/ldap/server/protocol/BindHandler.java	(revision 230777)
+++ src/main/java/org/apache/ldap/server/protocol/BindHandler.java	(working copy)
@@ -34,6 +34,7 @@
 import org.apache.ldap.common.message.LdapResultImpl;
 import org.apache.ldap.common.message.ResultCodeEnum;
 import org.apache.ldap.common.util.ExceptionUtils;
+import org.apache.log4j.Logger;
 
 /*
  * I would like to eventually see these newly introduced dependencies
@@ -61,6 +62,8 @@
  */
 public class BindHandler implements MessageHandler
 {
+    private static final Logger LOG = Logger.getLogger( BindHandler.class );
+
     private static final Control[] EMPTY = new Control[0];
 
 
@@ -150,10 +153,15 @@
                         req.getType() ) );
             }
 
-            String msg = "Bind failure:\n" + ExceptionUtils.getStackTrace( e );
+            String msg = "Bind failed";
 
-            msg += "\n\nBindRequest = \n" + req.toString();
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+                msg += "\n\nBindRequest = \n" + req.toString();
+            }
 
+
             result.setErrorMessage( msg );
 
             session.write( resp );