2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 88181b2..1a80ebf 100644
--- a/Changelog
+++ b/Changelog
@@ -105,7 +105,8 @@ interimap (0.5) upstream;
  - interimap: for the reason explained above, limit number of messages
    to 128 per APPEND command (only on servers advertizing MULTIAPPEND,
    for other servers the number remains 1).
- - interimap: gracefully ignore messages with NIL RFC822 attribute.
+ - interimap: gracefully ignore messages with a NIL RFC822 attribute.
+ - pullimap: treat messages with a NIL RFC822 attribute as empty.
 
  -- Guilhem Moulin <guilhem@fripost.org>  Fri, 10 May 2019 00:58:14 +0200
 
diff --git a/pullimap b/pullimap
index 1dc4b9e..fbe300e 100755
--- a/pullimap
+++ b/pullimap
@@ -166,7 +166,7 @@ sub sendmail($$) {
              );
 
     print STDERR "C: [...]\n" if $CONFIG{debug};
-    if ($$rfc822 eq '') {
+    if (!defined $$rfc822 or $$rfc822 eq "") {
         # RFC 5321 section 4.1.1.4: if there was no mail data, the first
         # "\r\n" ends the DATA command itself
         $SMTP->printflush("\r\n.\r\n") or die;