diff --git a/zap/src/main/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParameters.java b/zap/src/main/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParameters.java
index fa40d636811..24ea3129f80 100644
--- a/zap/src/main/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParameters.java
+++ b/zap/src/main/java/org/parosproxy/paros/core/scanner/VariantMultipartFormParameters.java
@@ -78,6 +78,14 @@ public void setMessage(HttpMessage msg) {
             return;
         }
 
+        try {
+            parseImpl(msg, contentType);
+        } catch (Exception e) {
+            LOGGER.error("An error occurred while parsing multipart content:", e);
+        }
+    }
+
+    private void parseImpl(HttpMessage msg, String contentType) {
         ArrayList<NameValuePair> extractedParameters = new ArrayList<>();
         int position = 0;
         int offset = 0;