diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index 7e2153dc..e9e83658 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 30 11:40:17 MST 2007 - jnorman@novell.com
+
+- Bug 239984. Handle null for message in Preferences dialog.  
+
 -------------------------------------------------------------------
 Tue Jan 24 13:40:21 MST 2007 - cmashayekhi@novell.com
 - Bug 238315. Scripts casacfgpam and casaucfgpam were fixed by
diff --git a/CASA/gui/CasaMain.cs b/CASA/gui/CasaMain.cs
index ca3a712b..3dd36117 100644
--- a/CASA/gui/CasaMain.cs
+++ b/CASA/gui/CasaMain.cs
@@ -1841,21 +1841,24 @@ namespace Novell.CASA.GUI
 			string sNewDir = entryStorageDirectory.Text;
 			string sOldDir = Common.GetUserPersistentDir(config);
 			try
-			{
-                if (!sNewDir.Equals(sOldDir))
-                {
-                    string sMoveMessage = MoveMiCASAFiles(sOldDir, sNewDir);
-                    if (sMoveMessage.Equals("Success"))
-                    {
-                        // save off selected directory
-                        Common.SetUserPersistentDir(config, sNewDir);
-                        CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir);
-                    }
-                    else
-                    {
-                        CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage);
-                        bCloseDialog = false;
-                    }
+			{
+                if (!sNewDir.Equals(sOldDir))
+                {
+                    string sMoveMessage = MoveMiCASAFiles(sOldDir, sNewDir);
+                    if (sMoveMessage != null)
+                    {
+                        if (sMoveMessage.Equals("Success"))
+                        {
+                            // save off selected directory
+                            Common.SetUserPersistentDir(config, sNewDir);
+                            CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir);
+                        }
+                        else
+                        {
+                            CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage);
+                            bCloseDialog = false;
+                        }
+                    }
                 }
 			}
 			catch (Exception e)
@@ -2188,11 +2191,11 @@ namespace Novell.CASA.GUI
 		}
 
 		public void on_importSecrets_activate(object obj, EventArgs args)
-		{
-            if (objMiCasa != null)
-            {
-                objMiCasa.DoFileImport(config);
-                objMiCasa.AggregateStore();
+		{
+            if (objMiCasa != null)
+            {
+                objMiCasa.DoFileImport(config);
+                objMiCasa.AggregateStore();
             }
 		}