Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java
===================================================================
--- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java	(revision 32358)
+++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java	(revision 32359)
@@ -89,5 +89,5 @@
         
                 // add layer to show way points
-                Main.main.addLayer(gpxLayer);
+                Main.getLayerManager().addLayer(gpxLayer);
         
                 progressMonitor.setTicksCount(3);
@@ -111,5 +111,5 @@
                         Main.info("Data size: " + ml.data.size());
             
-                        Main.main.addLayer(ml);
+                        Main.getLayerManager().addLayer(ml);
                         if (ml.data.isEmpty()) {
                             Main.warn("File contains no markers.");
Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java
===================================================================
--- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java	(revision 32358)
+++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java	(revision 32359)
@@ -514,6 +514,5 @@
     public File getVoxFilePath(String fileDir, String voxFile) {
         // The FAT16 file name is interpreted differently from case-sensitive
-        // file systems, so we
-        // have to test several variants
+        // file systems, so we have to test several variants
         String[] fileNameVariants = new String[] { voxFile,
             voxFile.toLowerCase(), voxFile.toUpperCase() };
@@ -541,5 +540,5 @@
         // Position errors (dop = dilution of position)
         f = ColumbusCSVUtils.floatFromString(csvLine[11]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.PDOP_TAG, f);
         } else {
@@ -548,5 +547,5 @@
     
         f = ColumbusCSVUtils.floatFromString(csvLine[12]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.HDOP_TAG, f);
         } else {
@@ -555,5 +554,5 @@
     
         f = ColumbusCSVUtils.floatFromString(csvLine[13]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.VDOP_TAG, f);
         } else {