diff --git a/libraries/utils.robot b/libraries/utils.robot
index 6aab95a..e776ed5 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -199,6 +199,7 @@
     #validate olt states
     Wait Until Keyword Succeeds    ${timeout}    5s
     ...    Validate OLT Device    PREPROVISIONED    UNKNOWN    UNKNOWN    ${EMPTY}    ${olt_device_id}
+    Sleep    5s
     Enable Device    ${olt_device_id}
     Wait Until Keyword Succeeds    ${timeout}    5s
     ...    Validate OLT Device    ENABLED    ACTIVE    REACHABLE    ${olt_serial_number}
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 977087c..9640838 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -111,7 +111,7 @@
     List Should Not Contain Value    ${ids}    ${fakeDeviceId}
     #Disable fake device id
     ${rc}  ${output}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device disable ${fakeDeviceId}
-    Should Contain    ${output}     Error while disabling '${fakeDeviceId}': rpc error: code = NotFound desc
+    Should Contain    ${output}     Error while disabling '${fakeDeviceId}'
 
 Check deletion of OLT/ONU before disabling
     [Documentation]    Try deleting OL/ONU before disabling and check error message