diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index bd0217f8cab..4284d12a542 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -216,7 +216,7 @@ class deployDataCenters():
             pnetprov.name = "VpcVirtualRouter"
             pnetprovres = self.apiClient.listNetworkServiceProviders(pnetprov)
             
-            if len(pnetprovres) > 0:
+            if pnetprovres and len(pnetprovres) > 0:
                 vpcvrprov = listVirtualRouterElements.listVirtualRouterElementsCmd()
                 vpcvrprov.nspid = pnetprovres[0].id
                 vpcvrprovresponse = self.apiClient.listVirtualRouterElements(vpcvrprov)
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index ace6f6cb181..5e0c6dadb32 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -61,7 +61,6 @@ class MarvinPlugin(Plugin):
         cfg = nose.config.Config()
         cfg.logStream = self.result_stream
         cfg.debugLog = self.debug_stream
-        cfg.workingDir = options.test_dir
         
         self.testrunner = nose.core.TextTestRunner(stream=self.result_stream, descriptions=True, verbosity=2, config=config)