diff --git a/common/iobuf.c b/common/iobuf.c
index 07edbbefd..6370efbfe 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -2201,7 +2201,7 @@ iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen)
 
 /* Copies the data from the input iobuf SOURCE to the output iobuf
    DEST until either an error is encountered or EOF is reached.
-   Returns the number of bytes copies.  */
+   Returns the number of bytes copies or (size_t)(-1) on error.  */
 size_t
 iobuf_copy (iobuf_t dest, iobuf_t source)
 {
@@ -2214,11 +2214,11 @@ iobuf_copy (iobuf_t dest, iobuf_t source)
   size_t max_read = 0;
   int err;
 
-  assert (source->use == IOBUF_INPUT || source->use == IOBUF_INPUT_TEMP);
-  assert (dest->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
+  log_assert (source->use == IOBUF_INPUT || source->use == IOBUF_INPUT_TEMP);
+  log_assert (dest->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
 
   if (iobuf_error (dest))
-    return -1;
+    return (size_t)(-1);
 
   temp = xmalloc (temp_size);
   while (1)
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 266bf54e4..a40ed0d82 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -753,6 +753,9 @@ do_plaintext( IOBUF out, int ctb, PKT_plaintext *pt )
     if (pt->buf)
       {
         nbytes = iobuf_copy (out, pt->buf);
+        if (nbytes == (size_t)(-1)
+            && (iobuf_error (out) || iobuf_error (pt->buf)))
+            return iobuf_error (out)? iobuf_error (out):iobuf_error (pt->buf);
         if(ctb_new_format_p (ctb) && !pt->len)
           /* Turn off partial body length mode.  */
           iobuf_set_partial_body_length_mode (out, 0);
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 4b055fd26..aba161ddd 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -878,6 +878,8 @@ encrypt_filter (void *opaque, int control,
     {
       if ( !efx->header_okay )
         {
+          efx->header_okay = 1;
+
           efx->cfx.dek = create_dek_with_warnings (0, efx->pk_list);
 
           rc = check_encryption_compliance (efx->cfx.dek, efx->pk_list);
@@ -904,8 +906,6 @@ encrypt_filter (void *opaque, int control,
             }
 
           iobuf_push_filter (a, cipher_filter_cfb, &efx->cfx);
-
-          efx->header_okay = 1;
         }
       rc = iobuf_write (a, buf, size);