diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
index 219bf607c1b7..2ce54ad11c7c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
@@ -72,7 +72,10 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
     GrExpression selected = getInvokedExpression();
     PsiType thisType = selected.getType();
 
-    if (thisType == null) return null;
+    if (thisType == null) {
+      thisType = TypesUtil.getJavaLangObject(this);
+    }
+
 
     GrArgumentList argList = getArgumentList();
 
@@ -153,7 +156,9 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
     GrExpression invoked = getInvokedExpression();
     PsiType thisType = invoked.getType();
 
-    if (thisType == null) return GroovyResolveResult.EMPTY_ARRAY;
+    if (thisType == null) {
+      thisType = TypesUtil.getJavaLangObject(this);
+    }
 
     GrArgumentList argList = getArgumentList();
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
index 992c5bfccc6b..d5dbb5681728 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
@@ -570,7 +570,7 @@ print i<warning descr="'getAt' in 'X' cannot be applied to '(java.lang.String, j
 
   void testArrayAccess5() {
     testHighlighting('''\
-print a<warning descr="Cannot resolve index access with arguments (java.lang.Integer)">[1]</warning>
+print a<warning descr="'getAt' in 'org.codehaus.groovy.runtime.DefaultGroovyMethods' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">[1, 2]</warning>
 ''')
   }
 
@@ -632,7 +632,7 @@ i<warning descr="'putAt' in 'X' cannot be applied to '(java.lang.String, java.la
 
   void testArrayAccess10() {
     testHighlighting('''\
-a<warning descr="Cannot resolve index access with arguments (java.lang.Integer, java.lang.Integer)">[1]</warning> = 2
+a<warning descr="'putAt' in 'org.codehaus.groovy.runtime.DefaultGroovyMethods' cannot be applied to '(java.lang.Integer, java.lang.Integer, java.lang.Integer)'">[1, 3]</warning> = 2
 ''')
   }
 
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/unresolvedArrayAccess.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/unresolvedArrayAccess.java
index bf6515e7cb67..dc65c743da98 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/unresolvedArrayAccess.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/unresolvedArrayAccess.java
@@ -1,2 +1,2 @@
 java.lang.Object foo;
-print(foo.getAt(1));
+print(org.codehaus.groovy.runtime.DefaultGroovyMethods.getAt(foo, 1));