From dae23d7fa1a7c086e0dec5a65985cf6bfc2bcd73 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Fri, 3 Feb 2017 19:03:03 +0100
Subject: [PATCH] NPE

---
 .../intellij/images/thumbnail/impl/ThumbnailViewUI.java    | 5 ++++-
 images/src/org/intellij/images/ui/ImageComponent.java      | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
index ea7e635bed6f..dd9b485d6816 100644
--- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
+++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
@@ -268,7 +268,10 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
                 setFileName(file.getName());
                 String toolTipText = IfsUtil.getReferencePath(thumbnailView.getProject(), file);
                 if (!isFileSizeVisible()) {
-                    toolTipText += " [" + getImageComponent().getDescription() + "]";
+                    String description = getImageComponent().getDescription();
+                    if (description != null) {
+                        toolTipText += " [" + description + "]";
+                    }
                 }
                 setToolTipText(toolTipText);
                 setDirectory(file.isDirectory());
diff --git a/images/src/org/intellij/images/ui/ImageComponent.java b/images/src/org/intellij/images/ui/ImageComponent.java
index 7647c85cb0c4..da7a54a2c104 100644
--- a/images/src/org/intellij/images/ui/ImageComponent.java
+++ b/images/src/org/intellij/images/ui/ImageComponent.java
@@ -24,6 +24,7 @@ import org.intellij.images.editor.ImageDocument;
 import org.intellij.images.options.GridOptions;
 import org.intellij.images.options.TransparencyChessboardOptions;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -200,9 +201,13 @@ public class ImageComponent extends JComponent {
         return grid.isVisible();
     }
 
+    @Nullable
     public String getDescription() {
         BufferedImage image = getDocument().getValue();
-        return ImagesBundle.message("icon.dimensions", image.getWidth(), image.getHeight(), image.getColorModel().getPixelSize());
+        if (image != null) {
+            return ImagesBundle.message("icon.dimensions", image.getWidth(), image.getHeight(), image.getColorModel().getPixelSize());
+        }
+        return null;
     }
 
     public void setCanvasSize(int width, int height) {