diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java
index 9e1a199bcd69..974a8a1e7fdd 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java
@@ -26,19 +26,20 @@ import org.jetbrains.annotations.NotNull;
 public class ExtensionPointName<T> {
   private final String myName;
 
-  public ExtensionPointName(@NonNls final String name) {
+  public ExtensionPointName(@NotNull @NonNls final String name) {
     myName = name;
   }
 
-  public static <T> ExtensionPointName<T> create(@NonNls final String name) {
+  @NotNull
+  public static <T> ExtensionPointName<T> create(@NotNull @NonNls final String name) {
     return new ExtensionPointName<T>(name);
   }
 
+  @NotNull
   public String getName() {
     return myName;
   }
 
-
   @Override
   public String toString() {
     return myName;
@@ -49,6 +50,7 @@ public class ExtensionPointName<T> {
     return Extensions.getExtensions(this);
   }
 
+  @NotNull
   public T[] getExtensions(AreaInstance areaInstance) {
     return Extensions.getExtensions(this, areaInstance);
   }
diff --git a/platform/platform-impl/src/org/jetbrains/ide/HttpRequestHandler.kt b/platform/platform-impl/src/org/jetbrains/ide/HttpRequestHandler.kt
index 7ce47dc90f7c..9c1ba621df12 100644
--- a/platform/platform-impl/src/org/jetbrains/ide/HttpRequestHandler.kt
+++ b/platform/platform-impl/src/org/jetbrains/ide/HttpRequestHandler.kt
@@ -29,7 +29,7 @@ import java.io.IOException
 abstract class HttpRequestHandler {
   companion object {
     // Your handler will be instantiated on first user request
-    val EP_NAME = ExtensionPointName.create<HttpRequestHandler>("com.intellij.httpRequestHandler")!!
+    val EP_NAME = ExtensionPointName.create<HttpRequestHandler>("com.intellij.httpRequestHandler")
 
     @JvmStatic
     fun checkPrefix(uri: String, prefix: String): Boolean {