diff --git a/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index 4ed74644770c436e5a3c973bdeed493b09908c6b..b03bf653fc58b6b1e8eb578a71fa34e92ea68e65 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -588,6 +588,10 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
     }
 
     private void addDefault(String key, Object value) {
+        if (compiledDefaults == null) {
+            return;
+        }
+
         String prefix = parsePrefix(key);
         if (prefix != null) {
             Map<String, Object> keys = compiledDefaults.get(prefix);
diff --git a/test/javax/swing/plaf/nimbus/Test7048204.java b/test/javax/swing/plaf/nimbus/Test7048204.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ec9c0774d2f512b02711373d210a5dc908e7c65
--- /dev/null
+++ b/test/javax/swing/plaf/nimbus/Test7048204.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 7048204
+   @summary NPE from NimbusLookAndFeel.addDefault
+   @author Pavel Porvatov
+*/
+
+import javax.swing.*;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+
+public class Test7048204 {
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel(new NimbusLookAndFeel());
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                new JLabel();
+
+                UIDefaults uid = UIManager.getDefaults();
+                uid.putDefaults(new Object[0]);
+                uid.put("what.ever", "else");
+            }
+        });
+    }
+}