diff --git a/ChangeLog b/ChangeLog
index 2c73a657d..935f6c057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-27  Stefan Bidigaray <stefanbidi@gmail.com>
+
+	* Source/NSNumberFormatter.m: Set some sensible defaults.
+
 2011-01-26  Stefan Bidigaray <stefanbidi@gmail.com>
 
 	* Source/NSLocale.m: Add currency code to locale identifier, if present.
diff --git a/Source/NSNumberFormatter.m b/Source/NSNumberFormatter.m
index 7039c7971..c129ae326 100644
--- a/Source/NSNumberFormatter.m
+++ b/Source/NSNumberFormatter.m
@@ -428,8 +428,17 @@ static NSUInteger _defaultBehavior = 0;
   
   _behavior = _defaultBehavior;
   _locale = RETAIN([NSLocale currentLocale]);
+  _style = NSNumberFormatterDecimalStyle;
   [self _resetUNumberFormat];
-
+  if (_formatter == NULL)
+    {
+      RELEASE(self);
+      return nil;
+    }
+  
+  // Set default values...
+  [self setMaximumFractionDigits: 2];
+  
   return self;
 }