1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index e0d99d0f0..ed93b4308 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -523,7 +523,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             try
                             {
                                 initHwConfig = false;
-                                ActiveMachine = machineCreationDialogVM.SelectedMachineVersion.CreatePrototypeMachine(ActiveMachineAdapter.Context);
+                                ActiveMachine = await machineCreationDialogVM.SelectedMachineVersion.CreatePrototypeMachine(ActiveMachineAdapter.Context);
                                 ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
                                 ActiveMachine.Name = machineCreationDialogVM.Name;
                                 ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
@@ -547,7 +547,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         {
                             var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
 
-                            var existingDispenser = await ActiveMachineAdapter.Context.Dispensers.Include(x => x.IdsPacks).SingleAsync(x => x.SerialNumber == serial);
+                            var existingDispenser = await ActiveMachineAdapter.Context.Dispensers.Include(x => x.IdsPacks).SingleOrDefaultAsync(x => x.SerialNumber == serial);
 
                             if (existingDispenser != null)
                             {