From ccba876c57b2ae28b2d167e9c8e7eab3b4d738de Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Tue, 31 Jan 2017 14:53:22 +0300
Subject: [PATCH] EA-93577 - NPE: UISettings.setupEditorAntialiasing

---
 .../editor-ui-api/src/com/intellij/ide/ui/UISettings.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
index 4bc1080af643..8e8c340c0a97 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
@@ -354,6 +354,9 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
   }
 
   public static void setupEditorAntialiasing(JComponent component) {
-    component.putClientProperty(SwingUtilities2.AA_TEXT_PROPERTY_KEY, getInstance().EDITOR_AA_TYPE.getTextInfo());
+    AntialiasingType aaType = getInstance().EDITOR_AA_TYPE;
+    if (aaType != null) {
+      component.putClientProperty(SwingUtilities2.AA_TEXT_PROPERTY_KEY, aaType.getTextInfo());
+    }
   }
 }
\ No newline at end of file