Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 28948)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 28949)
@@ -64,4 +64,6 @@
 	private VideoPositionLayer videoPositionLayer;
 	private GPSVideoPlayer gpsVideoPlayer;
+	
+	public static String VLC_VERSION = "2.0.x";
 
 	public VideoPlugin(PluginInformation info) {
@@ -236,6 +238,13 @@
             	enableVideoControlMenus(true);
         	}
-        	if (gpsVideoPlayer != null) {
+        	if (gpsVideoPlayer != null && gpsVideoPlayer.isCorrectlyInitiliazed()) {
         	    gpsVideoPlayer.addVideo(fc.getSelectedFile());
+        	} else {
+                JOptionPane.showMessageDialog(Main.parent, 
+                        tr("VLC library is not correctly initialized."+
+                                " Please check that VLC {0} is correctly installed on your system."+
+                                " Its architecture (32/64 bits) must also be the same as the JRE that runs JOSM.", VLC_VERSION),
+                        tr("Error"), JOptionPane.ERROR_MESSAGE
+                        );
         	}
         }		
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java	(revision 28948)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java	(revision 28949)
@@ -30,6 +30,6 @@
 	}
 
-	public GPSVideo addVideo(File Videofile) {		
-		GPSVideo video = new GPSVideo(super.addVideo(Videofile,Integer.toString(videos.size())));
+	public GPSVideo addVideo(File videofile) {		
+		GPSVideo video = new GPSVideo(super.addVideo(videofile,Integer.toString(videos.size())));
 		enableSingleVideoMode(true);
 		videos.add(video);
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java	(revision 28948)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java	(revision 28949)
@@ -66,7 +66,6 @@
 	}
 	
-	public Video addVideo(File Videofile, String id)
-	{
-		Video video = new Video(Videofile,id,videoengine.mediaPlayerFactory);
+	public Video addVideo(File videofile, String id) {
+		Video video = new Video(videofile,id,videoengine.mediaPlayerFactory);
 		canvasPanel.add(video.panel);
 		video.canvas.setSize(new Dimension(300, 300)); // will be updated by the video engine itself
@@ -374,6 +373,6 @@
 	}
     
-
-    
-
+	public boolean isCorrectlyInitiliazed() {
+	    return videoengine != null && videoengine.mediaPlayerFactory != null;
+	}
 }