diff --git a/pkg/crawler/main.go b/pkg/crawler/main.go
index 9b1e9bd..f0e09b6 100644
--- a/pkg/crawler/main.go
+++ b/pkg/crawler/main.go
@@ -67,8 +67,8 @@ type Links struct {
 type Power struct {
 	State           string   `json:"state,omitempty"`
 	Mode            string   `json:"mode,omitempty"`
-	RestorePolicy   string   `json:"restore_policy"`
-	PowerControlIDs []string `json:"power_control_ids`
+	RestorePolicy   string   `json:"restore_policy,omitempty"`
+	PowerControlIDs []string `json:"power_control_ids,omitempty"`
 }
 
 type InventoryDetail struct {
@@ -265,8 +265,10 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 	systems := []InventoryDetail{}
 	for _, rf_computersystem := range rf_systems {
 		var (
-			managerLinks []string
-			chassisLinks []string
+			managerLinks    []string
+			chassisLinks    []string
+			power           *redfish.Power
+			powercontrolIDs []string
 		)
 
 		// get all of the links to managers
@@ -286,6 +288,19 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 
 		if rf_chassis != nil {
 			chassisLinks = append(chassisLinks, rf_chassis.ODataID)
+
+			// get power-related details from rf_chassis
+			power, err = rf_chassis.Power()
+			if err != nil {
+				log.Warn().Err(err).Str("id", rf_computersystem.ID).
+					Str("system", rf_computersystem.Name).Msg("failed to get power-related details from chassis")
+			}
+
+			// extract the power control odata.id resource
+			powercontrolIDs := []string{}
+			for _, rf_powercontrol := range power.PowerControl {
+				powercontrolIDs = append(powercontrolIDs, rf_powercontrol.ODataID)
+			}
 		}
 
 		// convert supported reset types to []string
@@ -294,18 +309,6 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 			actions = append(actions, string(action))
 		}
 
-		// get power-related details from rf_chassis
-		power, err := rf_chassis.Power()
-		if err != nil {
-			log.Warn().Err(err).Str("id", rf_computersystem.ID).
-				Str("system", rf_computersystem.Name).Msg("failed to get power-related details from chassis")
-		}
-		// extract the power control odata.id resource
-		powercontrolIDs := []string{}
-		for _, rf_powercontrol := range power.PowerControl {
-			powercontrolIDs = append(powercontrolIDs, rf_powercontrol.ODataID)
-		}
-
 		// get all of the links to the chassis
 		system := InventoryDetail{
 			URI:          baseURI + "/redfish/v1/Systems/" + rf_computersystem.ID,