diff --git a/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl b/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl
index dc07ec71934..955d5bf011d 100644
--- a/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl
+++ b/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl
@@ -120,6 +120,7 @@ interface nsILDAPOperation : nsISupports
      * @exception NS_ERROR_OUT_OF_MEMORY
      * @exception NS_ERROR_INVALID_ARG
      * @exception NS_ERROR_LDAP_NOT_SUPPORTED
+     * @exception NS_ERROR_LDAP_FILTER_ERROR
      *
      * XXX doesn't currently handle LDAPControl params
      */
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
index 292a11f4972..d31f17ccbde 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
@@ -281,6 +281,9 @@ nsLDAPOperation::SearchExt(const PRUnichar *aBaseDn, PRInt32 aScope,
     case LDAP_PARAM_ERROR:
         return NS_ERROR_INVALID_ARG;
 
+    case LDAP_FILTER_ERROR:
+        return NS_ERROR_LDAP_FILTER_ERROR;
+
     default:
         NS_ERROR("nsLDAPOperation::SearchExt(): unexpected return value");
         return NS_ERROR_UNEXPECTED;
diff --git a/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp b/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp
index 48d379ad9fe..bd4d49569e5 100644
--- a/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp
+++ b/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp
@@ -870,6 +870,14 @@ nsLDAPAutoCompleteSession::StartLDAPSearch()
                                      BOUND);
             return NS_OK;
 
+        case NS_ERROR_LDAP_FILTER_ERROR:
+            PR_LOG(sLDAPAutoCompleteLogModule, PR_LOG_DEBUG, 
+                   ("nsLDAPAutoCompleteSession::StartLDAPSearch(): SearchExt "
+                    "returned NS_ERROR_LDAP_FILTER_ERROR"));
+            FinishAutoCompleteLookup(nsIAutoCompleteStatus::failureItems, rv, 
+                                     BOUND);
+            return NS_OK;
+
         case NS_ERROR_LDAP_SERVER_DOWN:
             // XXXdmose discuss with leif how to handle this in general in the 
             // LDAP XPCOM SDK.  
@@ -895,7 +903,7 @@ nsLDAPAutoCompleteSession::StartLDAPSearch()
             //
             NS_ERROR("nsLDAPAutoCompleteSession::StartLDAPSearch(): SearchExt "
                      "returned unexpected value");
-            FinishAutoCompleteLookup(nsIAutoCompleteStatus::failureItems, 0, 
+            FinishAutoCompleteLookup(nsIAutoCompleteStatus::failureItems, rv, 
                                      BOUND);
             return NS_ERROR_UNEXPECTED;
         }