Index: /applications/editors/josm/plugins/canvec_helper/build.xml
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/build.xml	(revision 29988)
+++ /applications/editors/josm/plugins/canvec_helper/build.xml	(revision 29989)
@@ -2,5 +2,5 @@
 <project name="canvec_helper" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="JOSM/Canvec_helper: update to new menu structure"/>
+    <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6162"/>
Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 29988)
+++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 29989)
@@ -178,5 +178,5 @@
 	}
 	public String getDownloadUrl() {
-		return String.format("http://ftp2.cits.rncan.gc.ca/osm/pub/%1$03d/%2$s/%1$03d%2$s%3$02d.zip",corda,cordb,cordc);
+		return String.format("http://ftp2.cits.rncan.gc.ca/OSM/pub/%1$03d/%2$s/%1$03d%2$s%3$02d.zip",corda,cordb,cordc);
 	}
 	private ZipFile open_zip() throws IOException {
@@ -199,4 +199,5 @@
 		while (entries.hasMoreElements()) {
 			ZipEntry entry = entries.nextElement();
+			if (entry.getName().equals("Metadata.txt")) continue;
 			sub_tile_ids.add(entry.getName());
 			zip_scanned = true;
@@ -220,4 +221,5 @@
 					Main.worker.submit(temp.getPostLayerTask());
 					Main.main.addLayer(temp.getLayer());
+					temp.getLayer().data.setUploadDiscouraged(false);
 				}
 			}
Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java
===================================================================
--- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 29988)
+++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 29989)
@@ -51,5 +51,5 @@
 			long start = System.currentTimeMillis();
 			Pattern p = Pattern.compile("(\\d\\d\\d)([A-Z]\\d\\d).*");
-			MirroredInputStream index = new MirroredInputStream("http://ftp2.cits.rncan.gc.ca/osm/pub/ZippedOsm.txt");
+			MirroredInputStream index = new MirroredInputStream("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt");
 			BufferedReader br = new BufferedReader(new InputStreamReader(index));
 			String line;
@@ -69,5 +69,8 @@
 					}
 					last_cell = cell;
-				} else System.out.print("bad line '" + line + "'\n");
+				} else if (line.contains("Metadata.txt")) {
+				} else {
+						System.out.print("bad line '" + line + "'\n");
+				}
 			}
 			br.close();
@@ -79,4 +82,5 @@
 		} catch (IOException e) {
 			System.out.println("exception getting index");
+			e.printStackTrace();
 		}
 	}