diff -urN Sendmail-PMilter-1.00-dist/lib/Sendmail/PMilter/Context.pm Sendmail-PMilter-1.00/lib/Sendmail/PMilter/Context.pm
--- Sendmail-PMilter-1.00-dist/lib/Sendmail/PMilter/Context.pm	2011-04-16 08:07:43.000000000 -0500
+++ Sendmail-PMilter-1.00/lib/Sendmail/PMilter/Context.pm	2013-04-29 14:18:04.774584648 -0500
@@ -472,7 +472,10 @@
 	my $this = shift;
 	my $key = shift;
 
-	foreach my $code (SMFIC_RCPT, SMFIC_MAIL, SMFIC_HELO, SMFIC_CONNECT) {
+	foreach my $code (SMFIC_UNKNOWN, SMFIC_DATA, SMFIC_QUIT, SMFIC_RCPT,
+	    SMFIC_OPTNEG, SMFIC_EOH, SMFIC_MAIL, SMFIC_HEADER, SMFIC_HELO,
+	    SMFIC_BODYEOB, SMFIC_MACRO, SMFIC_CONNECT, SMFIC_BODY,
+	    SMFIC_ABORT) {
 		my $val = $this->{symbols}{$code}{$key};
 
 		return $val if defined($val);
@@ -575,9 +578,11 @@
 
 sub addheader ($$$) {
 	my $this = shift;
-	my $header = shift || die "addheader: no header name\n";
-	my $value = shift || die "addheader: no header value\n";
+	my $header = shift;
+	my $value = shift;
 
+	die "addheader: no header name\n" if (! defined ($header));
+	die "addheader: no header value\n" if (! defined ($value));
 	die "addheader: called outside of EOM\n" if ($this->{cb} ne 'eom');
 	die "addheader: SMFIF_ADDHDRS not in capability list\n" unless ($this->{callback_flags} & SMFIF_ADDHDRS);