diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
index 039444f5ba0a..3cc2398371b8 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
@@ -570,18 +570,21 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
       String methodName = methodExpr.getReferenceName();
       if (methodName != null) {
         String[] words = NameUtil.nameToWords(methodName);
-        if (words.length > 1) {
-          String firstWord = words[0];
+        if (words.length > 0) {
+          final String firstWord = words[0];
           if (GET_PREFIX.equals(firstWord)
               || IS_PREFIX.equals(firstWord)
               || FIND_PREFIX.equals(firstWord)
               || CREATE_PREFIX.equals(firstWord)) {
-            final String propertyName = methodName.substring(firstWord.length());
-            final String[] names = getSuggestionsByName(propertyName, variableKind, false);
-            return new NamesByExprInfo(propertyName, names);
+            if (words.length > 1) {
+              final String propertyName = methodName.substring(firstWord.length());
+              final String[] names = getSuggestionsByName(propertyName, variableKind, false);
+              return new NamesByExprInfo(propertyName, names);
+            }
+          }
+          else if (words.length == 1) {
+            return new NamesByExprInfo(methodName, getSuggestionsByName(methodName, variableKind, false));
           }
-        } else {
-          return new NamesByExprInfo(methodName, getSuggestionsByName(methodName, variableKind, false));
         }
       }
     }