diff --git a/build.xml b/build.xml
index e981cd215a2..1862125cb6e 100644
--- a/build.xml
+++ b/build.xml
@@ -48,7 +48,7 @@
       <then>
         <path id="javac2.classpath">
           <pathelement location="${idea.sdk}/lib/javac2.jar"/>
-          <pathelement location="${idea.sdk}/lib/asm4-all.jar"/>
+          <pathelement location="${idea.sdk}/lib/asm-all.jar"/>
         </path>
         <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
         <echo message="Use javac2 from Idea lib"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt b/idea/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt
index 6048d0bc86b..bb8adaacc66 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt
@@ -22,10 +22,7 @@ import com.intellij.util.ProcessingContext
 import com.intellij.patterns.PlatformPatterns
 
 public class JetReferenceContributor() : PsiReferenceContributor() {
-    public override fun registerReferenceProviders(registrar: PsiReferenceRegistrar?) {
-        if (registrar == null) {
-            return
-        }
+    public override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
         with(registrar) {
             registerProvider(javaClass<JetSimpleNameExpression>()) {
                 JetSimpleNameReference(it)
@@ -55,7 +52,7 @@ public class JetReferenceContributor() : PsiReferenceContributor() {
             elementClass: Class<E>,
             factory: (E) -> R
         ) {
-        registerReferenceProvider(PlatformPatterns.psiElement(elementClass)!!, object: PsiReferenceProvider() {
+        registerReferenceProvider(PlatformPatterns.psiElement(elementClass), object: PsiReferenceProvider() {
             override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
                 [suppress("UNCHECKED_CAST")]
                     return array(factory(element as E))
diff --git a/update_dependencies.xml b/update_dependencies.xml
index fc95a87b540..0aba51fcd02 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="2591549"/>
-    <property name="public.buildserver.build.id" value="138515"/>
+    <property name="jb.buildserver.build.id" value="2601497"/>
+    <property name="public.buildserver.build.id" value="140153"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />