diff --git a/ChangeLog b/ChangeLog
index ee16a9897..4ee1f7ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 	* Documentation/gsdoc/NSNumber.gsdoc: document changes.
 	* Documentation/gsdoc/NSString.gsdoc: document changes.
 	* Testing/values.m: Added some number output tests.
+	* Source/NSUserDefaults.m: Locking bug fixed ... was locking before
+	lock had been created.
 
 2001-11-09  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index ad4ef03af..07ba18382 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -70,9 +70,9 @@ static Class	NSDictionaryClass;
 static Class	NSMutableDictionaryClass;
 static Class	NSStringClass;
 
-static NSUserDefaults    *sharedDefaults = nil;
-static NSMutableString   *processName = nil;
-static NSMutableArray    *userLanguages = nil;
+static NSUserDefaults	*sharedDefaults = nil;
+static NSMutableString	*processName = nil;
+static NSMutableArray	*userLanguages = nil;
 static NSRecursiveLock	*classLock = nil;
 
 /*
@@ -1393,11 +1393,11 @@ GSUserDefaultsDictionaryRepresentation()
 {
   NSDictionary	*defs;
 
-  [classLock lock];
   if (sharedDefaults == nil)
     {
       [NSUserDefaults standardUserDefaults];
     }
+  [classLock lock];
   defs = [sharedDefaults dictionaryRepresentation];
   [classLock unlock];
   return defs;