diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index aa5f5cc0b..803e91605 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -73,6 +73,7 @@ module.exports = Self => {
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'
     });
+
     let validateTin = require('../validations/validateTin');
     async function tinIsValid(err, done) {
         if (!this.isTaxDataChecked)
@@ -85,7 +86,7 @@ module.exports = Self => {
         let country = await Self.app.models.Country.findOne(filter);
         let code = country ? country.code.toLowerCase() : null;
 
-        if (!validateTin(this.fi, code))
+        if (!this.fi || !validateTin(this.fi, code))
             err();
         done();
     }