diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 9962c0d81..64b2b6afc 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -956,6 +956,9 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			break;
 		}
 
+		if(!$success)
+			return $success;
+
 		/* Check if value is in value set */
 		if($valueset = $this->getValueSetAsArray()) {
 			foreach($values as $value) {