diff --git a/src/test/utils/CordTestConfig.py b/src/test/utils/CordTestConfig.py
index 5653773..b3e24bd 100644
--- a/src/test/utils/CordTestConfig.py
+++ b/src/test/utils/CordTestConfig.py
@@ -147,8 +147,8 @@
     voltha_device = getattr(class_test, 'voltha_device')
     voltha_switch_map = getattr(class_test, 'voltha_switch_map')
     voltha_preconfigured = getattr(class_test, 'voltha_preconfigured')
-    voltha_teardown = getattr(class_test, 'VOLTHA_TEARDOWN')
-    if voltha_preconfigured is False and voltha_teardown is True:
+    voltha_tear = getattr(class_test, 'VOLTHA_TEARDOWN')
+    if voltha_preconfigured is False and voltha_tear is True:
         voltha_teardown(voltha_ctrl, voltha_device, voltha_switch_map)
 
 def running_on_ciab():
diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index aa19e6a..e5a996f 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -480,7 +480,8 @@
     return None
 
 def voltha_teardown(voltha_ctrl, device_id, switch_map, olt_app = None):
-    voltha_ctrl.disable_device(device_id)
+    if voltha_ctrl:
+        voltha_ctrl.disable_device(device_id)
     time.sleep(10)
     if olt_app is None:
         olt_app = get_olt_app()