lib/PublicInbox/Address.pm | 9 ++++++---
 t/address.t                | 5 +++++

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 433b36ebb4ef4f38170d9ee6cb51972c12b9a6d3..c23a5d622e5ba120b1b7a9c3cc48423180f08791 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -4,12 +4,15 @@ package PublicInbox::Address;
 use strict;
 use warnings;
 
-sub xs_emails { map { $_->address() } parse_email_addresses($_[0]) }
+sub xs_emails {
+	grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
 
 sub xs_names {
-	map {
+	grep { defined } map {
 		my $n = $_->name;
-		$n = $_->user if $n eq $_->address;
+		my $addr = $_->address;
+		$n = $_->user if defined($addr) && $n eq $addr;
 		$n;
 	} parse_email_addresses($_[0]);
 }
diff --git a/t/address.t b/t/address.t
index e7c0d6a8132516dd6649ea88234a4123016f7940..1f20702a2dbb7182a0b2c41fcadb675a2a97a204 100644
--- a/t/address.t
+++ b/t/address.t
@@ -38,6 +38,11 @@ 	}
 
 	@names = $names->('"Quote Unneeded" <user@example.com>');
 	is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+
+	my @emails = $emails->('Local User <user>');
+	is_deeply([], \@emails , 'no address for local address');
+	@names = $emails->('Local User <user>');
+	is_deeply([], \@names, 'no address, no name');
 }
 
 test_pkg('PublicInbox::Address');