diff --git a/src/org/openstreetmap/josm/actions/OpenFileAction.java b/src/org/openstreetmap/josm/actions/OpenFileAction.java
index a61bda6..99de6c0 100644
--- a/src/org/openstreetmap/josm/actions/OpenFileAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenFileAction.java
@@ -283,12 +283,7 @@ public class OpenFileAction extends DiskAccessAction {
         public void importData(FileImporter importer, List<File> files) {
             if (importer.isBatchImporter()) {
                 if (canceled) return;
-                String msg;
-                if (files.size() == 1) {
-                    msg = tr("Opening 1 file...");
-                } else {
-                    msg = trn("Opening {0} file...", "Opening {0} files...", files.size(), files.size());
-                }
+                String msg = trn("Opening {0} file...", "Opening {0} files...", files.size(), files.size());
                 getProgressMonitor().setCustomText(msg);
                 getProgressMonitor().indeterminateSubTask(msg);
                 if (importer.importDataHandleExceptions(files, getProgressMonitor().createSubTaskMonitor(files.size(), false))) {
diff --git a/src/org/openstreetmap/josm/io/OsmImporter.java b/src/org/openstreetmap/josm/io/OsmImporter.java
index 6ac4ef0..21af282 100644
--- a/src/org/openstreetmap/josm/io/OsmImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmImporter.java
@@ -9,6 +9,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -38,13 +39,21 @@ public class OsmImporter extends FileImporter {
         }
     }
 
-    protected void importData(InputStream in, File associatedFile) throws IllegalDataException {
-        DataSet dataSet = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+    protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
+        final DataSet dataSet = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
         final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
         // FIXME: remove UI stuff from IO subsystem
         //
         Runnable uiStuff = new Runnable() {
+            @Override
             public void run() {
+                if (dataSet.allPrimitives().isEmpty()) {
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            tr("No data found in file {0}.", associatedFile.getPath()),
+                            tr("Open OSM file"),
+                            JOptionPane.INFORMATION_MESSAGE);
+                }
                 Main.main.addLayer(layer);
                 layer.onPostLoadFromFile();
             }