diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 80dfe7c..1e31f31 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -4955,7 +4955,7 @@
             address = json.loads( output ).get( 'node' )
             self.address = address
             return address
-        except TypeError:
+        except ( TypeError, ValueError ):
             main.log.exception( self.name + ": Object not as expected" )
             return None
         except Exception:
diff --git a/TestON/tests/dependencies/utils.py b/TestON/tests/dependencies/utils.py
index de61ae2..8aaca08 100644
--- a/TestON/tests/dependencies/utils.py
+++ b/TestON/tests/dependencies/utils.py
@@ -88,7 +88,7 @@
                                                               "/tmp/karaf.log",
                                                               direction="from" )
             else:
-                scpResult = scpResult and main.ONOSbench.scp( ctrl,
+                scpResult = scpResult and main.ONOSbench.scp( ctrl.server,
                                                               "/opt/onos/log/karaf.log",
                                                               "/tmp/karaf.log",
                                                               direction="from" )