diff --git a/bms.py b/bms.py
index fee8ffcf154c95151269722320280fa02582727a..14cde46b5dd29d98150605179dea05fbc6898d89 100644
--- a/bms.py
+++ b/bms.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # A simple milter that has grown quite a bit.
 # $Log$
+# Revision 1.126  2008/08/18 17:47:57  customdesigned
+# Log rcpt for SRS rejections.
+#
 # Revision 1.125  2008/08/06 00:52:38  customdesigned
 # CBV policy sends no DSN.  DSN policy sends DSN.
 #
@@ -210,6 +213,7 @@ try:
   import gossip
   import gossip.client
   import gossip.server
+  gossip_node = None
 except: gossip = None
 
 # Import pysrs if available
@@ -893,7 +897,8 @@ class bmsMilter(Milter.Milter):
     else:
       global gossip
       if gossip and domain and rc == Milter.CONTINUE \
-          and not (self.internal_connection or self.trusted_relay):
+          and not (self.internal_connection or self.trusted_relay) \
+          and gossip_node:
         if self.spf and self.spf.result == 'pass':
           qual = 'SPF'
         elif res == 'pass':
diff --git a/pymilter.spec b/pymilter.spec
index 1cf3330c6e4cf9c8864c718fb33e3271f2e00fcf..2107aac47626e8b6eb2aa851025334e6c1d0e770 100644
--- a/pymilter.spec
+++ b/pymilter.spec
@@ -276,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Sep 24 2007 Stuart Gathman <stuart@bmsi.com> 0.8.10-1
 - log rcpt for SRS rejections
-- improved parsing into email and fullname
+- improved parsing into email and fullname (still 2 self test failures)
 - implement no-DSN CBV, reduce full DSNs
 - check for porn words in MAIL FROM fullname
 - ban IP for too many bad MAIL FROMs or RCPT TOs
diff --git a/testbms.py b/testbms.py
index 7f1a862f2f0f3140922a21c30ac5e88b3971dee3..50ee2dfa9a984ca0a2cb0c8c6201d9139ce6c1df 100644
--- a/testbms.py
+++ b/testbms.py
@@ -44,7 +44,7 @@ class TestMilter(bms.bmsMilter):
       self._msg[field] = value
     self.headerschanged = True
 
-  def addheader(self,field,value):
+  def addheader(self,field,value,idx=-1):
     if not self._body:
       raise IOError,"addheader not called from eom()"
     self.log('addheader: %s=%s' % (field,value))