diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index dcccddda..fc78613b 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -67,10 +67,12 @@ import Foundation
     }
     
     public func setValidity(_ valid: Bool, rule: RulesProtocol) {
-        if let fieldKey = fieldKey {
-            self.errorMessage = rule.errorMessage?[fieldKey]
-            self.isValid = valid
-        }        
+        if let fieldKey = fieldKey,
+            let ruleErrorMessage = rule.errorMessage?[fieldKey] {
+            self.errorMessage = ruleErrorMessage
+        }
+        self.isValid = valid
+
     }
     
     //--------------------------------------------------