diff --git a/lib/Qpsmtpd.pm b/lib/Qpsmtpd.pm
index 928b3b69..6b6b624a 100644
--- a/lib/Qpsmtpd.pm
+++ b/lib/Qpsmtpd.pm
@@ -448,7 +448,7 @@ sub auth_mechanism {
 sub address {
     my $self = shift;
     my $addr = Qpsmtpd::Address->new(@_);
-    $addr->qp($self);
+    $addr->qp($self) if $addr;
     return $addr;
 }