diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java
index d9b989f11c15..d8b501d8f013 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.debugger.memory.action;
 
-import com.intellij.debugger.memory.ui.JavaTypeInfo;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
@@ -42,6 +41,6 @@ public abstract class ClassesActionBase extends AnAction {
 
   @Nullable
   protected TypeInfo getSelectedClass(AnActionEvent e) {
-    return new JavaTypeInfo(ActionUtil.getSelectedClass(e));
+    return ActionUtil.getSelectedTypeInfo(e);
   }
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaReferenceInfo.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaReferenceInfo.java
index b22f4ae8d662..2f5c847621a3 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaReferenceInfo.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaReferenceInfo.java
@@ -3,14 +3,16 @@ package com.intellij.debugger.memory.ui;
 
 import com.intellij.xdebugger.memory.ui.ReferenceInfo;
 import com.sun.jdi.ObjectReference;
+import org.jetbrains.annotations.NotNull;
 
 public class JavaReferenceInfo implements ReferenceInfo {
   private final ObjectReference objectReference;
 
-  public JavaReferenceInfo(ObjectReference objectReference) {
+  public JavaReferenceInfo(@NotNull ObjectReference objectReference) {
     this.objectReference = objectReference;
   }
 
+  @NotNull
   public ObjectReference getObjectReference() {
     return objectReference;
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaTypeInfo.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaTypeInfo.java
index 8ec387e78c56..66f353b1383c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaTypeInfo.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/JavaTypeInfo.java
@@ -17,7 +17,7 @@ public class JavaTypeInfo implements TypeInfo {
     return types.stream().map(JavaTypeInfo::new).collect(Collectors.toList());
   }
 
-  public JavaTypeInfo(ReferenceType referenceType) {
+  public JavaTypeInfo(@NotNull ReferenceType referenceType) {
     this.referenceType = referenceType;
   }
 
@@ -33,6 +33,7 @@ public class JavaTypeInfo implements TypeInfo {
     return getReferenceType().instances(limit).stream().map(JavaReferenceInfo::new).collect(Collectors.toList());
   }
 
+  @NotNull
   public ReferenceType getReferenceType() {
     return referenceType;
   }