Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 10919)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 10920)
@@ -104,13 +104,13 @@
 	 * Collect options
 	 */
-	final int waylen = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_SEG, "500"));
-	final int maxnode = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_NODES, "50000"));
-	final int threshold = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_THRESHOLD_VALUE, "90"));
-	final double epsilon = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_EPSILON, "0.0003"));
-	final int resolution = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_RES, "4000"));
-	final int tilesize = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_SIZE, "2000"));
+	final int waylen = Main.pref.getInteger(LakewalkerPreferences.PREF_MAX_SEG, 500);
+	final int maxnode = Main.pref.getInteger(LakewalkerPreferences.PREF_MAX_NODES, 50000);
+	final int threshold = Main.pref.getInteger(LakewalkerPreferences.PREF_THRESHOLD_VALUE, 90);
+	final double epsilon = Main.pref.getDouble(LakewalkerPreferences.PREF_EPSILON, 0.0003);
+	final int resolution = Main.pref.getInteger(LakewalkerPreferences.PREF_LANDSAT_RES, 4000);
+	final int tilesize = Main.pref.getInteger(LakewalkerPreferences.PREF_LANDSAT_SIZE, 2000);
 	final String startdir = Main.pref.get(LakewalkerPreferences.PREF_START_DIR, "east");
-	final String wmslayer = Main.pref.get(LakewalkerPreferences.PREF_WMS, "IR1");      
-	   
+	final String wmslayer = Main.pref.get(LakewalkerPreferences.PREF_WMS, "IR1");
+
 	try {
         PleaseWaitRunnable lakewalkerTask = new PleaseWaitRunnable(tr("Tracing")){
@@ -186,13 +186,6 @@
 	Node fn = null;
 	
-	double eastOffset = 0.0;
-	double northOffset = 0.0;
-	try {
-	  eastOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_EAST_OFFSET, "0.0"));
-	  northOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_NORTH_OFFSET, "0.0"));
-	}
-	catch (Exception e) {
-	  
-	}
+	double eastOffset = Main.pref.getDouble(LakewalkerPreferences.PREF_EAST_OFFSET, 0.0);
+	double northOffset = Main.pref.getDouble(LakewalkerPreferences.PREF_NORTH_OFFSET, 0.0);
 	char option = ' ';
 	
@@ -217,5 +210,5 @@
 		way.nodes.add(n);
 		
-		if(nodesinway > Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_SEG, "500"))){
+		if(nodesinway > Main.pref.getInteger(LakewalkerPreferences.PREF_MAX_SEG, 500)){
 			String waytype = Main.pref.get(LakewalkerPreferences.PREF_WAYTYPE, "water");
 	        
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java	(revision 10919)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java	(revision 10920)
@@ -52,5 +52,5 @@
   protected JLabel northOffsetLabel = new JLabel(tr("Shift all traces to north (degrees)"));
   protected StringEnumConfigurer startDirConfig = new StringEnumConfigurer(DIRECTIONS);
-  protected JLabel startDirLabel = new JLabel(tr("Direction to search for land"));  
+  protected JLabel startDirLabel = new JLabel(tr("Direction to search for land"));
   protected StringEnumConfigurer lakeTypeConfig = new StringEnumConfigurer(WAYTYPES);
   protected JLabel lakeTypeLabel = new JLabel(tr("Tag ways as"));
@@ -78,13 +78,13 @@
     
     pythonConfig.setValue(Main.pref.get(PREF_PYTHON, "python.exe"));
-    maxSegsConfig.setValue(Main.pref.get(PREF_MAX_SEG, "500"));
-    maxNodesConfig.setValue(Main.pref.get(PREF_MAX_NODES, "50000"));
-    thresholdConfig.setValue(Main.pref.get(PREF_THRESHOLD, "35"));
-    thresholdConfigNew.setValue(Main.pref.get(PREF_THRESHOLD_VALUE, "90"));    
-    epsilonConfig.setValue(Main.pref.get(PREF_EPSILON, "0.0003"));
-    landsatResConfig.setValue(Main.pref.get(PREF_LANDSAT_RES, "4000"));
-    landsatSizeConfig.setValue(Main.pref.get(PREF_LANDSAT_SIZE, "2000"));
-    eastOffsetConfig.setValue(Main.pref.get(PREF_EAST_OFFSET, "0.0"));
-    northOffsetConfig.setValue(Main.pref.get(PREF_NORTH_OFFSET, "0.0"));
+    maxSegsConfig.setValue(Main.pref.getInteger(PREF_MAX_SEG, 500));
+    maxNodesConfig.setValue(Main.pref.getInteger(PREF_MAX_NODES, 50000));
+    thresholdConfig.setValue(Main.pref.getInteger(PREF_THRESHOLD, 35));
+    thresholdConfigNew.setValue(Main.pref.getInteger(PREF_THRESHOLD_VALUE, 90));
+    epsilonConfig.setValue(Main.pref.getDouble(PREF_EPSILON, 0.0003));
+    landsatResConfig.setValue(Main.pref.getInteger(PREF_LANDSAT_RES, 4000));
+    landsatSizeConfig.setValue(Main.pref.getInteger(PREF_LANDSAT_SIZE, 2000));
+    eastOffsetConfig.setValue(Main.pref.getDouble(PREF_EAST_OFFSET, 0.0));
+    northOffsetConfig.setValue(Main.pref.getDouble(PREF_NORTH_OFFSET, 0.0));
     startDirConfig.setValue(Main.pref.get(PREF_START_DIR, "east"));
     lakeTypeConfig.setValue(Main.pref.get(PREF_WAYTYPE, "water"));
@@ -129,5 +129,5 @@
   public void ok() {
     Main.pref.put(PREF_PYTHON, pythonConfig.getValueString());
-    Main.pref.put(PREF_MAX_SEG, maxSegsConfig.getValueString());    
+    Main.pref.put(PREF_MAX_SEG, maxSegsConfig.getValueString());
     Main.pref.put(PREF_MAX_NODES, maxNodesConfig.getValueString());
     Main.pref.put(PREF_THRESHOLD, thresholdConfig.getValueString());
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java	(revision 10919)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java	(revision 10920)
@@ -46,13 +46,6 @@
     String line;
     setStatus("Initializing");
-    double eastOffset = 0.0;
-    double northOffset = 0.0;
-    try {
-      eastOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_EAST_OFFSET, "0.0"));
-      northOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_NORTH_OFFSET, "0.0"));
-    }
-    catch (Exception e) {
-      
-    }
+    double eastOffset = Main.pref.getDouble(LakewalkerPreferences.PREF_EAST_OFFSET, 0.0);
+    double northOffset = Main.pref.getDouble(LakewalkerPreferences.PREF_NORTH_OFFSET, 0.0);
     char option = ' ';