diff --git a/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
index 1f369f16..4d59ef4e 100644
--- a/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs
@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.DocReceiverElements.Commands;
 using EnvelopeGenerator.Domain.Entities;
@@ -10,13 +11,13 @@ namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 /// Pipeline behavior that saves annotations.
 /// Executes first in the signing process.
 /// </summary>
-[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
+[Obsolete("The PSPDFKit library is deprecated.")]
 public class AnnotationBehavior : IPipelineBehavior<SigningCommand, Unit>
 {
     private readonly IRepository<ElementAnnotation> _repo;
 
     /// <summary>
-    /// 
+    /// Initializes a new instance of the <see cref="AnnotationBehavior"/> class.
     /// </summary>
     /// <param name="repository"></param>
     public AnnotationBehavior(IRepository<ElementAnnotation> repository)
@@ -29,13 +30,21 @@ public class AnnotationBehavior : IPipelineBehavior<SigningCommand, Unit>
     /// </summary>
     /// <param name="request"></param>
     /// <param name="next"></param>
-    /// <param name="cancellationToken"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
+    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancel)
     {
-        if (request.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
-            await _repo.CreateAsync(annot.Structured, cancellationToken);
+        if(request.ReceiverAppType != ReceiverAppType.LegacyWeb)
+            if(request.PsPdfKitAnnotation is null)
+                return await next(cancel);
+            else
+                throw new BadRequestException("PsPdfKit Annotation are only supported for the legacy web receiver type.");
 
-        return await next(cancellationToken);
+        if (request.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
+                await _repo.CreateAsync(annot.Structured, cancel);
+            else
+                throw new BadRequestException("Annotation data is missing or invalid.");
+
+            return await next(cancel);
     }
 }