diff --git a/server/src/merge.rs b/server/src/merge.rs
index 4eee6496d5..d47d912774 100644
--- a/server/src/merge.rs
+++ b/server/src/merge.rs
@@ -173,10 +173,16 @@ pub async fn stream(
                 let part_data = part_data(&s3, part).await?;
 
                 if let Some(acc) = &mut acc {
-                    let ops = serde_json::from_slice::<Vec<patch::PatchOperation>>(&part_data)?;
-
-                    if let Err(error) = patch::apply(acc, &ops) {
-                        error!("json patch error: {error}");
+                    let ops = serde_json::from_slice::<Vec<patch::PatchOperation>>(&part_data);
+                    match ops {
+                        Ok(ops) => {
+                            if let Err(error) = patch::apply(acc, &ops) {
+                                error!("json patch error: {error}");
+                            }
+                        }
+                        Err(error) => {
+                            error!("json patch deserialization error: {error}");
+                        }
                     }
                 } else {
                     acc = Some(serde_json::from_slice::<Value>(&part_data)?);
diff --git a/server/src/patch.rs b/server/src/patch.rs
index 9df966dd34..a431ff2e2f 100644
--- a/server/src/patch.rs
+++ b/server/src/patch.rs
@@ -3,7 +3,7 @@ use jsonptr::{Pointer, PointerBuf};
 use serde::{Deserialize, Serialize};
 use serde_json::{Number, Value, json};
 use thiserror::Error;
-
+use tracing::*;
 /// 'add' operation - increments a numeric value
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AddOperationExt {
@@ -70,8 +70,14 @@ impl<'de> serde::Deserialize<'de> for PatchOperation {
         if let Ok(op) = op {
             Ok(Self::Standard(op))
         } else {
+            let standard_error = op.err().unwrap();
             serde_json::from_value::<HulyPatchOperation>(value)
-                .map_err(serde::de::Error::custom)
+                .map_err(|huly_error| {
+                    serde::de::Error::custom(format!(
+                        "Failed to deserialize as StandardPatchOperation: {}. Also failed to deserialize as HulyPatchOperation: {}",
+                        standard_error, huly_error
+                    ))
+                })
                 .map(Self::Huly)
         }
     }
@@ -101,7 +107,10 @@ pub fn apply(doc: &mut Value, patches: &[PatchOperation]) -> Result<(), HulyPatc
             },
             PatchOperation::Standard(standard_op) => Ok(Some(standard_op.clone())),
         }? {
-            json_patch::patch(doc, &[op])?;
+            if let Err(e) = json_patch::patch(doc, &[op.clone()]) {
+                error!("Failed to apply patch {:?}: {}", patch, e);
+                return Err(e.into());
+            }
         }
     }
     Ok(())