Index: SearchHandler.java
===================================================================
--- SearchHandler.java	(revision 412203)
+++ SearchHandler.java	(working copy)
@@ -345,7 +345,13 @@
 
             LdapResult result = req.getResultResponse().getLdapResult();
             result.setResultCode( code );
-            result.setErrorMessage( msg );
+            String extraInfo="";
+            if (e.getMessage() != null) {
+                if (e.getMessage().trim().length()>0) {
+                    extraInfo=": " + e.getMessage();
+                }
+            }
+            result.setErrorMessage( msg + extraInfo );
 
             if ( ( e.getResolvedName() != null )
                 && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )