diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
index 2e9ad989c..c4bc5edcc 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
@@ -14,7 +14,7 @@ public class SimpleUtil {
   
   // Searches the entire project for Simple language files with instances of the Simple property with the given key
   public static List<SimpleProperty> findProperties(Project project, String key) {
-    List<SimpleProperty> result = null;
+    List<SimpleProperty> result = new ArrayList<>();
     Collection<VirtualFile> virtualFiles =
           FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project));
     for (VirtualFile virtualFile : virtualFiles) {
@@ -24,16 +24,13 @@ public class SimpleUtil {
         if (properties != null) {
           for (SimpleProperty property : properties) {
             if (key.equals(property.getKey())) {
-              if (result == null) {
-                result = new ArrayList<SimpleProperty>();
-              }
-              result.add(property);
+               result.add(property);
             }
           }
         }
       }
     }
-    return result != null ? result : Collections.<SimpleProperty>emptyList();
+    return result;
   }
   
   public static List<SimpleProperty> findProperties(Project project) {