diff --git a/bms.py b/bms.py
index 792361f..7388632 100644
--- a/bms.py
+++ b/bms.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python
 # A simple milter that has grown quite a bit.
 # $Log$
+# Revision 1.102  2007/03/30 18:13:41  customdesigned
+# Report bestguess and helo-spf as key-value pairs in Received-SPF
+# instead of in their own headers.
+#
 # Revision 1.101  2007/03/29 03:06:10  customdesigned
 # Don't count DSN and unqualified MAIL FROM as internal_domain.
 #
@@ -774,12 +778,14 @@ class bmsMilter(Milter.Milter):
           qual = res
         try:
           umis = gossip.umis(domain+qual,self.id+time.time())
-          res,hdr,val = gossip_node.query(umis,domain,qual,1)
-          self.add_header(hdr,val)
-          a = val.split(',')
-          self.reputation = int(a[-2])
-          self.confidence = int(a[-1])
-          self.umis = umis
+          res = gossip_node.query(umis,domain,qual,1)
+          if res:
+            res,hdr,val = gossip_node.query(umis,domain,qual,1)
+            self.add_header(hdr,val)
+            a = val.split(',')
+            self.reputation = int(a[-2])
+            self.confidence = int(a[-1])
+            self.umis = umis
         except:
           gossip = None
           raise
diff --git a/doc/faq.ht b/doc/faq.ht
index 3e2e441..a40f774 100644
--- a/doc/faq.ht
+++ b/doc/faq.ht
@@ -239,8 +239,8 @@ everything up for you.  For other systems:
 	How do I stop this behavior?
 <p>  A. The SPF response is controlled by <code>/etc/mail/access</code>
 	(actually the file you specify with <code>access_file</code> in
-	the <code>[spf]</code> section of <code>pymilter.cfg</code>.  Responses
-	are OK, CBV, and REJECT.  CBV sends the DSN.
+	the <code>[spf]</code> section of <code>pymilter.cfg</code>).  
+	Responses are OK, CBV, and REJECT.  CBV sends the DSN.
 <p>
 You can change the defaults.  For instance, I have:
 <pre>
diff --git a/doc/milter.ht b/doc/milter.ht
index dd4830b..9e73126 100644
--- a/doc/milter.ht
+++ b/doc/milter.ht
@@ -20,7 +20,7 @@ ALT="Viewable With Any Browser" BORDER="0"></A>
   Stuart D. Gathman</a><br>
 This web page is written by Stuart D. Gathman<br>and<br>sponsored by
 <a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
-Last updated Dec 29, 2005</h4>
+Last updated Mar 30, 2007</h4>
 
 See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> |
 <a href="http://bmsi.com/mailman/listinfo/pymilter">Subscribe to mailing list</a> |