diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 46b0074..ee908d3 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -401,11 +401,11 @@
           fi
 
           # copy the file
-          export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}')
-          kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap
+          export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}') || true
+          kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap || true
 
-          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}')
-          kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap
+          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}') || true
+          kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap || true
         fi
 
         cd voltha-system-tests
@@ -478,6 +478,7 @@
       // get ONOS debug infos
       sh '''
         sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 ports > $LOG_FOLDER/onos-ports-list.txt || true
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 hosts > $LOG_FOLDER/onos-hosts-list.txt || true
 
         if [ ${withFlows} = true ] ; then
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 volt-olts > $LOG_FOLDER/onos-olt-list.txt || true