diff --git a/src/Services/dgcVerifier/VaccineVerifier.ts b/src/Services/dgcVerifier/VaccineVerifier.ts
index 7fe9582..ac02a6b 100644
--- a/src/Services/dgcVerifier/VaccineVerifier.ts
+++ b/src/Services/dgcVerifier/VaccineVerifier.ts
@@ -36,7 +36,10 @@ export class VaccineVerifier {
     if(vaccineDiff <= 0){
       return this.getLogicValidityDays(validRulesSet, this.vaccineStartDayComplete, this.vaccineEndDayComplete,inoculationDate);
     } else {
-      return this.getLogicValidityDays(validRulesSet, this.vaccineStartDayNotComplete, this.vaccineEndDayNotComplete,inoculationDate);
+      const result = this.getLogicValidityDays(validRulesSet, this.vaccineStartDayNotComplete, this.vaccineEndDayNotComplete,inoculationDate);
+      if(result.valid)
+        result.message = 'Certificate is valid only in italy';
+      return result;
     }
   }
 
diff --git a/src/Services/dgcVerifier/Verifier.ts b/src/Services/dgcVerifier/Verifier.ts
index 42d9267..1dbfb6d 100644
--- a/src/Services/dgcVerifier/Verifier.ts
+++ b/src/Services/dgcVerifier/Verifier.ts
@@ -46,6 +46,7 @@ export default class Verifier {
       result = {signature:{valid: signatureValidity}, valid:  vaccineVerifier.checkCertifcate(dcc.payload), info:{identity:dcc.payload.nam,dob:dcc.payload.dob}};
     } catch (error) {
       console.log(error);
+      result = {signature:{valid: false}, valid:{valid:false, message:'nd'}, info:{identity:{fnt:'nd',fn:'nd',gnt:'nd',gn:'nd'},dob:'nd'}};
     }  
     return result;
   }