diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
index f0e52e8b1dde..11319e33440a 100644
--- a/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
+++ b/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
@@ -26,6 +26,7 @@ import org.intellij.images.options.*;
 import org.intellij.images.thumbnail.actionSystem.ThumbnailViewActions;
 import org.intellij.images.ui.ImageComponent;
 import org.intellij.images.vfs.IfsUtil;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -45,7 +46,7 @@ final class ImageEditorImpl extends VirtualFileAdapter implements ImageEditor {
     private final ImageEditorUI editorUI;
     private boolean disposed;
 
-    ImageEditorImpl(Project project, VirtualFile file) {
+    ImageEditorImpl(@NotNull Project project, @NotNull VirtualFile file) {
         this.project = project;
         this.file = file;
 
@@ -104,10 +105,12 @@ final class ImageEditorImpl extends VirtualFileAdapter implements ImageEditor {
         return editorUI.getImageComponent();
     }
 
+    @NotNull
     public VirtualFile getFile() {
         return file;
     }
 
+    @NotNull
     public Project getProject() {
         return project;
     }
diff --git a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
index 0aa969169762..be3c13575781 100644
--- a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
+++ b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
@@ -45,7 +45,7 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE
     private static final String NAME = "ImageFileEditor";
     private final ImageEditor imageEditor;
 
-    ImageFileEditorImpl(Project project, VirtualFile file) {
+    ImageFileEditorImpl(@NotNull Project project, @NotNull VirtualFile file) {
         imageEditor = ImageEditorManagerImpl.createImageEditor(project, file);
 
         // Append file listener
@@ -130,6 +130,7 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE
         ImageEditorManagerImpl.releaseImageEditor(imageEditor);
     }
 
+    @NotNull
     public ImageEditor getImageEditor() {
         return imageEditor;
     }