diff --git a/CASA/gui/FileChooser.cs b/CASA/gui/FileChooser.cs
index 15f5b1eb..aedf729b 100644
--- a/CASA/gui/FileChooser.cs
+++ b/CASA/gui/FileChooser.cs
@@ -258,7 +258,9 @@ namespace Novell.CASA.GUI
 			DirectoryInfo[] dirs = dirInfo.GetDirectories();
 			
 			for (int i=0; i<dirs.Length; i++)
-			{								
+			{					
+				if (dirs[i].Name.StartsWith(".")) continue;				
+				
 				ts.AppendValues(new Gdk.Pixbuf (Common.IMAGE_PATH + "folder.png"), dirs[i].Name, "", "File folder");
 			}
 
diff --git a/CASA/gui/ImportSecrets.cs b/CASA/gui/ImportSecrets.cs
index 248b3641..3aaac29e 100644
--- a/CASA/gui/ImportSecrets.cs
+++ b/CASA/gui/ImportSecrets.cs
@@ -58,26 +58,33 @@ namespace Novell.CASA.GUI
 				if (File.Exists(sFile))
 				{									
 					
-					// let's read it
-					FileStream fs = new FileStream(sFile, FileMode.Open);
-					buffer = new byte[fs.Length];
-
-					int iBytes = fs.Read(buffer, 0, (int)fs.Length);	
-					string data = System.Text.Encoding.ASCII.GetString(buffer);
-
-					fs.Flush();
-					fs.Close();
-
-					// check for clear text secrets
-					if (data.StartsWith("<?xml"))
+					try
 					{
-						ImportXMLSecrets addSecrets = new ImportXMLSecrets(null, null, sFile);
-						MiCasaRequestReply.Send(MiCasaRequestReply.VERB_ADD_XML_SECRETS, null, null, null, addSecrets);
-						CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Import complete");
+						// let's read it
+						FileStream fs = new FileStream(sFile, FileMode.Open);
+						buffer = new byte[fs.Length];
+
+						int iBytes = fs.Read(buffer, 0, (int)fs.Length);	
+						string data = System.Text.Encoding.ASCII.GetString(buffer);
+
+						fs.Flush();
+						fs.Close();
+
+						// check for clear text secrets
+						if (data.StartsWith("<?xml"))
+						{
+							ImportXMLSecrets addSecrets = new ImportXMLSecrets(null, null, sFile);
+							MiCasaRequestReply.Send(MiCasaRequestReply.VERB_ADD_XML_SECRETS, null, null, null, addSecrets);
+							CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Import complete");
+						}
+						else
+						{
+							GetMasterPasswordUsedForImport();
+						}
 					}
-					else
-					{
-						GetMasterPasswordUsedForImport();
+					catch (Exception e)
+					{					
+						CommonGUI.DisplayMessage(Gtk.MessageType.Error, e.Message); 
 					}
 				}				
 			}