diff --git a/services/client/common/methods/client/before-save.js b/services/client/common/methods/client/before-save.js
index 470b7ba3fa..b761a71f12 100644
--- a/services/client/common/methods/client/before-save.js
+++ b/services/client/common/methods/client/before-save.js
@@ -116,12 +116,7 @@ module.exports = function(Client) {
         }
 
         function maxCb(_, instances) {
-            if (!instances) {
-                done(generateErrorCredit());
-                return;
-            }
-
-            if (instances.length !== 1 || instances[0].employeeFk == userId || instances[0].amount > 0) {
+            if (!instances || instances.length !== 1 || instances[0].employeeFk == userId || instances[0].amount > 0) {
                 done();
                 return;
             }
diff --git a/services/client/common/validations/validateDni.js b/services/client/common/validations/validateDni.js
index ab90086057..94b595f096 100644
--- a/services/client/common/validations/validateDni.js
+++ b/services/client/common/validations/validateDni.js
@@ -1,4 +1,7 @@
 module.exports = fi => {
+    if (fi === undefined || fi === null) {
+        return true;
+    }
     let dni = fi;
     let getLetterDni = dni => {
         const regExpDni = 'TRWAGMYFPDXBNJZSQVHLCKE';