1 files changed, 12 insertions, 9 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
index 51d88c3f9..e29ba3b6f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
@@ -92,16 +92,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             HardwareVersion hardwareVersion = configuration.HardwareVersion;
 
-            _hwConfig = configuration.GetHardwareConfiguration();
+            if (hardwareVersion != null)
+            {
+                _hwConfig = configuration.GetHardwareConfiguration();
 
-            Collections.Clear();
-            Collections.Add(CreateMotorsCollection(hardwareVersion));
-            Collections.Add(CreateDancerCollection(hardwareVersion));
-            Collections.Add(CreatePidCollection(hardwareVersion));
-            Collections.Add(CreateWindersCollection(hardwareVersion));
-            Collections.Add(CreateSpeedSensorsCollection(hardwareVersion));
-            Collections.Add(CreateBlowersCollection(hardwareVersion));
-            Collections.Add(CreateBreakSensorCollection(hardwareVersion));
+                Collections.Clear();
+                Collections.Add(CreateMotorsCollection(hardwareVersion));
+                Collections.Add(CreateDancerCollection(hardwareVersion));
+                Collections.Add(CreatePidCollection(hardwareVersion));
+                Collections.Add(CreateWindersCollection(hardwareVersion));
+                Collections.Add(CreateSpeedSensorsCollection(hardwareVersion));
+                Collections.Add(CreateBlowersCollection(hardwareVersion));
+                Collections.Add(CreateBreakSensorCollection(hardwareVersion));
+            }
         }
 
         private HardwareCollection CreateMotorsCollection(HardwareVersion hardwareVersion)