diff --git a/resources/qml/AddMachineDialog.qml b/resources/qml/AddMachineDialog.qml
index 350435d1ca..8d0ff9af02 100644
--- a/resources/qml/AddMachineDialog.qml
+++ b/resources/qml/AddMachineDialog.qml
@@ -16,6 +16,7 @@ UM.Dialog
 {
     id: base
     title: catalog.i18nc("@title:window", "Add Printer")
+    property bool firstRun: false
     property string preferredCategory: "Ultimaker"
     property string activeCategory: preferredCategory
 
@@ -32,7 +33,7 @@ UM.Dialog
     signal machineAdded(string id)
     function getMachineName()
     {
-        var name = machineList.model.get(machineList.currentIndex).name
+        var name = machineList.model.get(machineList.currentIndex) != undefined ? machineList.model.get(machineList.currentIndex).name : ""
         return name
     }
 
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index ae72353e0e..5f45a062b8 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -677,6 +677,7 @@ UM.MainWindow
         id: addMachineDialog
         onMachineAdded:
         {
+            machineActionsWizard.firstRun = addMachineDialog.firstRun
             machineActionsWizard.start(id)
         }
     }
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index e5b04d1ee9..e48448ae4c 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -83,7 +83,7 @@ UM.ManagementPage
             Repeater
             {
                 id: machineActionRepeater
-                model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id))
+                model: base.currentItem ? Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
 
                 Button
                 {
@@ -125,8 +125,8 @@ UM.ManagementPage
 
             spacing: UM.Theme.getSize("default_margin").height
 
-            Label { text: catalog.i18nc("@label", "Type") }
-            Label { text: base.currentItem ? base.currentItem.metadata.definition_name : "" }
+            Label { text: catalog.i18nc("@label", "Type"); visible: base.currentItem }
+            Label { text: (base.currentItem && base.currentItem.metadata) ? base.currentItem.metadata.definition_name : "" }
         }
 
         UM.I18nCatalog { id: catalog; name: "uranium"; }