diff --git a/ChangeLog b/ChangeLog
index 3c4c9831aa..55862320fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-28  Christian Stimming  <stimming@tuhh.de>
+
+	* src/scm/main.scm: Patch by Peter O'Gorman <peter@pogma.com> for
+	Mac OS X.
+
 2002-12-27  Christian Stimming  <stimming@tuhh.de>
 
 	* src/engine/test-core/Makefile.am: Fix linker errors in
diff --git a/src/scm/main.scm b/src/scm/main.scm
index bd51bf9d7c..16c5cf04f2 100644
--- a/src/scm/main.scm
+++ b/src/scm/main.scm
@@ -351,7 +351,7 @@ string and 'directories' must be a list of strings."
   (gnc:setup-debugging)
 
   ;; before doing ANYTHING, set the locale!
-  (setlocale LC_ALL "")
+  (false-if-exception (setlocale LC_ALL ""))
 
   ;; initialize the gnucash module system 
   (gnc:module-system-init)