diff --git a/Jenkinsfile.newBuildSystem b/Jenkinsfile.newBuildSystem
index 46a3ede..8c9eca2 100644
--- a/Jenkinsfile.newBuildSystem
+++ b/Jenkinsfile.newBuildSystem
@@ -198,8 +198,10 @@
                     stage ("Configure the compute nodes") {
                         leafSwitchNum = 0
                         for(int i=0; i < deployment_config.fabric_switches.size(); i++) {
-                            if(deployment_config.fabric_switches[i].role.toLowerCase().contains("leaf")) {
-                                leafSwitchNum += 1
+                            if(deployment_config.fabric_switches[i].containsKey("role") {
+                                if(deployment_config.fabric_switches[i].role.toLowerCase().contains("leaf")) {
+                                    leafSwitchNum += 1
+                                }
                             }
                         }
                         // Configure head-node