diff --git a/guile/examples/contacts-export b/guile/examples/contacts-export
index 2e16e8ed..82186429 100755
--- a/guile/examples/contacts-export
+++ b/guile/examples/contacts-export
@@ -3,7 +3,7 @@ exec guile -e main -s $0 $@
 !#
 
 ;;
-;; Copyright (C) 2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+;; Copyright (C) 2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;;
 ;; This program is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the
diff --git a/guile/mu/contact.scm b/guile/mu/contact.scm
index a75fbc3f..5ca35685 100644
--- a/guile/mu/contact.scm
+++ b/guile/mu/contact.scm
@@ -113,7 +113,7 @@ either \"org-contact\", \"mutt-alias\", \"mutt-ab\",
 	      (string-downcase (or name email)))))
     (cond
       ((string= form "plain")
-	(format #f "~a~a~a" (if name name) (if name " ") email))
+	(format #f "~a~a~a" (or name "") (if name " " "") email))
       ((string= form "org-contact")
 	(format #f "* ~s\n:PROPERTIES:\n:EMAIL:~a\n:NICK:~a\n:END:"
 	  (or name email) email nick))
diff --git a/src/mu-msg.c b/src/mu-msg.c
index 8c9b908e..72c6ded4 100644
--- a/src/mu-msg.c
+++ b/src/mu-msg.c
@@ -564,7 +564,10 @@ fill_contact (MuMsgContact *self, InternetAddress *addr,
 	else
 		self->address  = NULL;
 
-	return TRUE;
+	/* note, the address could NULL e.g. when the recipient is something like
+	 * 'Undisclosed recipients'
+	 */
+	return self->address != NULL;
 }