1 files changed, 2 insertions, 12 deletions
diff --git a/crypto/src/asn1/cms/EnvelopedData.cs b/crypto/src/asn1/cms/EnvelopedData.cs
index 09f291a93..41dae548f 100644
--- a/crypto/src/asn1/cms/EnvelopedData.cs
+++ b/crypto/src/asn1/cms/EnvelopedData.cs
@@ -137,19 +137,9 @@ namespace Org.BouncyCastle.Asn1.Cms
         public override Asn1Object ToAsn1Object()
         {
             Asn1EncodableVector v = new Asn1EncodableVector(version);
-
-            if (originatorInfo != null)
-            {
-                v.Add(new DerTaggedObject(false, 0, originatorInfo));
-            }
-
+            v.AddOptionalTagged(false, 0, originatorInfo);
             v.Add(recipientInfos, encryptedContentInfo);
-
-            if (unprotectedAttrs != null)
-            {
-                v.Add(new DerTaggedObject(false, 1, unprotectedAttrs));
-            }
-
+            v.AddOptionalTagged(false, 1, unprotectedAttrs);
             return new BerSequence(v);
         }