diff --git a/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java b/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
index 6a3fbbf39328..ea35b265378c 100644
--- a/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
+++ b/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ public class LanguageExtensionPoint<T> extends CustomLoadingExtensionPointBean i
     }
   };
 
+  @NotNull
   @Override
   public T getInstance() {
     return myHandler.getValue();
diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtensionPoint.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtensionPoint.java
index f8c7a318173c..3e821d270a31 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtensionPoint.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtensionPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.util.LazyInstance;
 import com.intellij.util.KeyedLazyInstance;
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.NotNull;
 
 public class FileTypeExtensionPoint<T> extends AbstractExtensionPointBean implements KeyedLazyInstance<T> {
 
@@ -40,6 +41,7 @@ public class FileTypeExtensionPoint<T> extends AbstractExtensionPointBean implem
     }
   };
 
+  @NotNull
   @Override
   public T getInstance() {
     return myHandler.getValue();
diff --git a/platform/core-api/src/com/intellij/openapi/util/ClassExtensionPoint.java b/platform/core-api/src/com/intellij/openapi/util/ClassExtensionPoint.java
index 5a80280280eb..79fd896e7abb 100644
--- a/platform/core-api/src/com/intellij/openapi/util/ClassExtensionPoint.java
+++ b/platform/core-api/src/com/intellij/openapi/util/ClassExtensionPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 package com.intellij.openapi.util;
 
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
-import com.intellij.openapi.util.LazyInstance;
 import com.intellij.util.KeyedLazyInstance;
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.NotNull;
 
 public class ClassExtensionPoint<T> extends AbstractExtensionPointBean implements KeyedLazyInstance<T> {
   // these must be public for scrambling compatibility
@@ -39,6 +39,7 @@ public class ClassExtensionPoint<T> extends AbstractExtensionPointBean implement
     }
   };
 
+  @NotNull
   @Override
   public T getInstance() {
     return myHandler.getValue();
diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java b/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
index 9ccd791edc59..00e4e637cf4e 100644
--- a/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
+++ b/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
@@ -31,6 +31,7 @@ import com.intellij.util.xmlb.annotations.AbstractCollection;
 import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.Property;
 import com.intellij.util.xmlb.annotations.Tag;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -95,11 +96,13 @@ public class PsiReferenceProviderBean extends AbstractExtensionPointBean impleme
     }
   }
 
+  @NotNull
   @Override
   public String getKey() {
     return language;
   }
 
+  @NotNull
   @Override
   public PsiReferenceProviderBean getInstance() {
     return this;
diff --git a/platform/core-api/src/com/intellij/util/KeyedLazyInstance.java b/platform/core-api/src/com/intellij/util/KeyedLazyInstance.java
index cbb7333049ae..5543a3f5f8b2 100644
--- a/platform/core-api/src/com/intellij/util/KeyedLazyInstance.java
+++ b/platform/core-api/src/com/intellij/util/KeyedLazyInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,10 @@
  */
 package com.intellij.util;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface KeyedLazyInstance<T> {
   String getKey();
+  @NotNull
   T getInstance();
 }
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/util/KeyedLazyInstanceEP.java b/platform/core-api/src/com/intellij/util/KeyedLazyInstanceEP.java
index 5d4463c6bcfb..e83d3f164cd9 100644
--- a/platform/core-api/src/com/intellij/util/KeyedLazyInstanceEP.java
+++ b/platform/core-api/src/com/intellij/util/KeyedLazyInstanceEP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.intellij.util;
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.util.LazyInstance;
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author yole
@@ -38,6 +39,7 @@ public class KeyedLazyInstanceEP<T> extends AbstractExtensionPointBean implement
     }
   };
 
+  @NotNull
   @Override
   public T getInstance() {
     return myHandler.getValue();
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceContributorEP.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceContributorEP.java
index 5c2ea08ecda6..d975364e9617 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceContributorEP.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceContributorEP.java
@@ -48,6 +48,7 @@ public class PsiReferenceContributorEP extends CustomLoadingExtensionPointBean i
     }
   };
 
+  @NotNull
   @Override
   public PsiReferenceContributor getInstance() {
     return myHandler.getValue();
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/CustomLoadingExtensionPointBean.java b/platform/extensions/src/com/intellij/openapi/extensions/CustomLoadingExtensionPointBean.java
index e3350221edba..2e13078d4019 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/CustomLoadingExtensionPointBean.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/CustomLoadingExtensionPointBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.intellij.openapi.extensions;
 
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.NotNull;
 import org.picocontainer.PicoContainer;
 
 /**
@@ -29,7 +30,8 @@ public class CustomLoadingExtensionPointBean extends AbstractExtensionPointBean
   @Attribute("factoryArgument")
   public String factoryArgument;
 
-  protected Object instantiateExtension(final String implementationClass, final PicoContainer picoContainer) throws ClassNotFoundException {
+  @NotNull
+  protected Object instantiateExtension(String implementationClass, @NotNull PicoContainer picoContainer) throws ClassNotFoundException {
     if (factoryClass != null) {
       ExtensionFactory factory = instantiate(factoryClass, picoContainer);
       return factory.createInstance(factoryArgument, implementationClass);
diff --git a/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java b/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java
index 11bf87e7a2cd..62377452c27a 100644
--- a/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java
+++ b/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java
@@ -53,6 +53,7 @@ public class WeigherExtensionPoint extends AbstractExtensionPointBean implements
     }
   };
 
+  @NotNull
   @Override
   public Weigher getInstance() {
     return myHandler.getValue();
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsServiceEP.java b/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsServiceEP.java
index 1c3f51a544e7..385636f3cae9 100755
--- a/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsServiceEP.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsServiceEP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.util.LazyInstance;
 import com.intellij.util.KeyedLazyInstance;
 import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.NotNull;
 
 public class StatisticsServiceEP extends AbstractExtensionPointBean implements KeyedLazyInstance<StatisticsService> {
   @Attribute("key")
@@ -35,6 +36,7 @@ public class StatisticsServiceEP extends AbstractExtensionPointBean implements K
     }
   };
 
+  @NotNull
   @Override
   public StatisticsService getInstance() {
     return myHandler.getValue();