1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
index 9d203b76d..93c7490fb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
@@ -17,7 +17,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         public List<HardwareVersion> HardwareVersionsFiltered
         {
-            get { return HardwareVersions.Where(x => x.MachineType == (int)MachineType).ToList(); }
+            get { return HardwareVersions != null ? HardwareVersions.Where(x => x.MachineType == (int)MachineType).ToList() : null; }
         }
 
         private HardwareVersion _selectedHardwareVersion;
@@ -64,7 +64,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         protected override bool CanOK()
         {
-            return base.CanOK() && !String.IsNullOrWhiteSpace(SerialNumber) && !String.IsNullOrWhiteSpace(Name) && SelectedHardwareVersion != null;
+            return base.CanOK() && !String.IsNullOrWhiteSpace(SerialNumber) && !String.IsNullOrWhiteSpace(Name) && (SelectedHardwareVersion != null || HardwareVersions == null);
         }
     }
 }