diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js b/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
index 614e6982ce..6b49579586 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
@@ -464,3 +464,20 @@ function CloneItemSubfield(original){
     // insert this line on the page
     original.parentNode.insertBefore(clone,original.nextSibling);
 }
+
+/**
+ * Check mandatory subfields of a cataloging form and adds <code>missing</code> class to those who are empty.<br>
+ * @param p the parent object of subfields to check
+ * @return the number of empty mandatory subfields
+ */
+function CheckMandatorySubfields(p){
+    var total = 0;
+    $(p).find(".subfield_line input[name='mandatory'][value='1']").each(function(i){
+        var editor = $(this).siblings("[name='field_value']");
+        if (!editor.val()) {
+            editor.addClass("missing");
+            total++;
+        }
+    });
+    return total;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index a3714dac80..2877e138b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -40,27 +40,15 @@ function active(numlayer)
     }
 }
 function Check(f) {
-    var total_errors=0;
-    $("input[name='mandatory'],select[name='mandatory']").each(function(i){
-        if($(this).val() == 1){
-            var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i);
-            if(mandatory_field.val() == ''){
-                mandatory_field.addClass("missing");
-                total_errors++;
-            }
-        }
-    });
-
-    var alertString2;
-    if (total_errors==0) {
-        return true;
-    } else {
-        alertString2  = _("Form not submitted because of the following problem(s)");
+    var total_errors = CheckMandatorySubfields(f);
+    if (total_errors > 0) {
+        var alertString2 = _("Form not submitted because of the following problem(s)");
         alertString2 += "\n------------------------------------------------------------------------------------\n";
-        alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (highlighted)");
+        alertString2 += "\n- "+ total_errors + _(" mandatory fields empty (highlighted)");
         alert(alertString2);
         return false;
     }
+    return true;
 }
 function CheckMultipleAdd(f) {