--- a/src/core/edu/xtec/jclic/media/EventSounds.java
+++ b/src/core/edu/xtec/jclic/media/EventSounds.java
@@ -220,11 +220,16 @@
     }
     
     public void close(){
-        for(int i=0; i<NUM_EVENTS; i++)
-            if(elements[i]!=null){
-                elements[i].close();
-                elements[i]=null;
-            }
+	try
+	{
+	    for(int i=0; i<NUM_EVENTS; i++)
+	        if(elements[i]!=null){
+	            elements[i].close();
+	            elements[i]=null;
+	        }
+	} catch(Exception ex) {
+	}
+
         parent=null;
     }
     
--- a/src/utilities/edu/xtec/util/Messages.java
+++ b/src/utilities/edu/xtec/util/Messages.java
@@ -113,7 +113,17 @@
         //pane.setSelectionValues(DESCRIPTIVE_LANGUAGE_CODES);
         pane.setSelectionValues(getDescriptiveLanguageCodes(null));
         pane.setWantsInput(true);
-        String initialSelection = getDescriptiveLanguageCode(Locale.getDefault().getLanguage());
+//        String initialSelection = getDescriptiveLanguageCode(Locale.getDefault().getLanguage());
+        if (System.getenv("LANG").contains("valenci"))
+        {
+            System.out.println(" [ Valencian ] ");
+            systemlanguage="qcv";
+        }
+        else
+        {
+            System.out.println(" [ LANG ] ");
+        }
+        String initialSelection=getDescriptiveLanguageCode(systemlanguage);
         pane.setInitialSelectionValue(initialSelection);
         showDlg((Component) options.get(Options.MAIN_PARENT_COMPONENT), pane, "Language selecion");
         String sel = (String) pane.getInputValue();
@@ -681,6 +691,7 @@
   static {
     ISO_639_2_CODES.put("ast", "asturianu");
     ISO_639_2_CODES.put("vec", "vèneto");
+    ISO_639_2_CODES.put("qcv","valenci\u00E0");
   }
 
   public static String getDescriptiveLanguageCode(String languageCode) {
--- a/src/player/edu/xtec/jclic/SingleInstanceJFrame.java
+++ b/src/player/edu/xtec/jclic/SingleInstanceJFrame.java
@@ -230,16 +230,20 @@
     
     /** Exit the Application */
     private void exitForm(java.awt.event.WindowEvent evt) {
-        if(socketThread!=null)
-            socketThread.stopSocketThread();
-        if(rc!=null){
-            rc.end();
-            rc=null;
-        }
-        while(socketThread!=null){
-            Thread.yield();
-        }        
-        System.exit(0);
+	try
+        {
+            if(socketThread!=null)
+                socketThread.stopSocketThread();
+            if(rc!=null){
+                rc.end();
+                rc=null;
+            }
+            while(socketThread!=null){
+                Thread.currentThread().yield();
+            }
+       }catch(Exception ex){
+            System.exit(0);
+       }
     }
     
     protected boolean checkOtherInstance(int port){