diff --git a/VERSION b/VERSION
index ba4d58b..9181b73 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-1.0.16
+1.0.17
 
diff --git a/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py b/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
index 4e1aacb..67e25c4 100644
--- a/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
@@ -57,8 +57,8 @@
         si.save_changed_fields()
 
     def process_onu_state(self, si):
+        [valid, message] = AttHelpers.validate_onu(self.logger, si)
         if si.onu_state == "AWAITING" or si.onu_state == "ENABLED":
-            [valid, message] = AttHelpers.validate_onu(self.logger, si)
             si.status_message = message
             if valid:
                 si.onu_state = "ENABLED"
@@ -66,8 +66,11 @@
             else:
                 si.onu_state = "DISABLED"
                 self.update_onu(si.serial_number, "DISABLED")
-        else:
-            si.status_message = "ONU has been disabled"
+        else: # DISABLED
+            if not valid:
+                si.status_message = message
+            else:
+                si.status_message = "ONU has been disabled"
             self.update_onu(si.serial_number, "DISABLED")
 
     def process_auth_state(self, si):