Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 7864)
+++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 7865)
@@ -199,7 +199,9 @@
              */
             FileImporter chosenImporter = null;
-            for (FileImporter importer : ExtensionFileFilter.importers) {
-                if (fileFilter.equals(importer.filter)) {
-                    chosenImporter = importer;
+            if (fileFilter != null) {
+                for (FileImporter importer : ExtensionFileFilter.importers) {
+                    if (fileFilter.equals(importer.filter)) {
+                        chosenImporter = importer;
+                    }
                 }
             }
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 7864)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 7865)
@@ -53,5 +53,5 @@
     /**
      * Determines the OSM primitive type of the given object.
-     * @param obj the S object to inspect
+     * @param obj the OSM object to inspect
      * @return the OSM primitive type of {@code obj}
      * @throws IllegalArgumentException if {@code obj} is null or of unknown type