diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index ba1313e..71da9a1 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -83,6 +83,12 @@
     Should Be Equal As Integers    ${rc1}    0
     Should Be Equal As Integers    ${rc2}    0
 
+Get Device List from Voltha
+    [Documentation]    Gets Device List Output from Voltha
+    ${rc1}    ${devices}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device list
+    Log    ${devices}
+    Should Be Equal As Integers    ${rc1}    0
+
 Validate Device
     [Arguments]    ${admin_state}  ${oper_status}  ${connect_status}  ${serial_number}=${EMPTY}  ${device_id}=${EMPTY}
     ...    ${onu_reason}=${EMPTY}   ${onu}=False
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 5bc1a40..44a6bd7 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -86,6 +86,7 @@
         ...    ${dst['container_name']}
         Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
         ...    Validate Subscriber DHCP Allocation    ${k8s_node_ip}    ${ONOS_SSH_PORT}    ${onu_port}
+        Run Keyword and Ignore Error   Get Device Output from Voltha    ${onu_device_id}
     END
 
 Test Disable and Enable ONU
@@ -208,8 +209,9 @@
 
 Teardown
     [Documentation]    kills processes and cleans up interfaces on src+dst servers
-    Get Device Output from Voltha    ${olt_device_id}
-    #Get Logical Device Output from Voltha    ${logical_id}
+    Run Keyword and Ignore Error    Get Device List from Voltha
+    Run Keyword and Ignore Error    Get Device Output from Voltha    ${olt_device_id}
+    Run Keyword and Ignore Error    Get Logical Device Output from Voltha    ${logical_id}
     Run Keyword If    ${external_libs}    Get ONOS Status    ${k8s_node_ip}
     Run Keyword If    ${has_dataplane}    Clean Up Linux
     Run Keyword If    ${external_libs}    Log Kubernetes Containers Logs Since Time    ${datetime}    ${container_list}