diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 673012cf68..a0e1132793 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -213,6 +213,31 @@ class Asset extends Depreciable
         $this->attributes['expected_checkin'] = $value;
     }
 
+
+
+    public function customFieldValidationRules()
+    {
+
+        $customFieldValidationRules = [];
+
+            if (($this->model) && ($this->model->fieldset)) {
+
+                foreach ($this->model->fieldset->fields as $field) {
+
+                    if ($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
+
+                $customFieldValidationRules += $this->model->fieldset->validation_rules();
+            }
+
+        return $customFieldValidationRules;
+
+    }
+
+
+
     /**
      * This handles the custom field validation for assets
      *
@@ -220,29 +245,7 @@ class Asset extends Depreciable
      */
     public function save(array $params = [])
     {
-        if ($this->model_id != '') {
-            $model = AssetModel::find($this->model_id);
-
-            if (($model) && ($model->fieldset)) {
-
-                foreach ($model->fieldset->fields as $field){
-                    if($field->format == 'BOOLEAN'){
-                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                    }
-                }
-
-                $this->rules += $model->fieldset->validation_rules();
-
-                if ($this->model->fieldset){
-                    foreach ($this->model->fieldset->fields as $field){
-                        if($field->format == 'BOOLEAN'){
-                            $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                        }
-                    }
-                }
-            }
-        }
-
+        $this->rules += $this->customFieldValidationRules();
         return parent::save($params);
     }
 
@@ -254,7 +257,7 @@ class Asset extends Depreciable
 
     /**
      * Returns the warranty expiration date as Carbon object
-     * @return \Carbon|null
+     * @return \Carbon\Carbon|null
      */
     public function getWarrantyExpiresAttribute()
     {