diff --git a/src/main/java/airsquared/blobsaver/app/Controller.java b/src/main/java/airsquared/blobsaver/app/Controller.java
index a6773309..52ee8e50 100644
--- a/src/main/java/airsquared/blobsaver/app/Controller.java
+++ b/src/main/java/airsquared/blobsaver/app/Controller.java
@@ -665,6 +665,13 @@ private TSS createTSS(String runningAlertTitle) {
                 .setIncludeBetas(betaCheckBox.isSelected())
                 .saveToTSSSaver(saveToTSSSaverCheckBox.isSelected())
                 .saveToSHSHHost(saveToSHSHHostCheckBox.isSelected());
+        if (pathField.getText().contains("${Name}") && deviceName == null) {
+            final Alert deviceNameAlert = new Alert(Alert.AlertType.WARNING);
+            deviceNameAlert.setTitle("Warning");
+            deviceNameAlert.setHeaderText("Warning");
+            deviceNameAlert.setContentText("You are using ${Name} variable but your device does not have a name yet. Maybe you forgot to save it or did not select it in the list first?");
+            deviceNameAlert.showAndWait();
+        }
         if (!boardConfigField.isDisabled()) {
             builder.setBoardConfig(boardConfigField.getText());
         }