diff --git a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
index b39319773c1d..de6634e15935 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
@@ -87,12 +87,7 @@ class CacheUpdateRunner {
             int percent = (int)(processed.size() * 100 / total);
             indicator.setText("Indexing... " + percent + "%");
             if (ApplicationManager.getApplication().isInternal()) {
-              if (virtualFile.isValid()) {
-                indicator.setText2(virtualFile.getPresentableUrl());
-              }
-              else {
-                indicator.setText2("");
-              }
+              indicator.setText2(virtualFile.getPresentableUrl());
             }
           }
         }
diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java b/platform/usageView/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java
index 38081a2b951c..17302e0fa7bf 100644
--- a/platform/usageView/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java
+++ b/platform/usageView/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java
@@ -100,12 +100,7 @@ public class DirectoryGroupingRule implements UsageGroupingRule {
     @NotNull
     public String getText(UsageView view) {
       String relativePath = VfsUtilCore.getRelativePath(myDir, myProject.getBaseDir(), File.separatorChar);
-      if (relativePath != null) {
-        return relativePath;
-      }
-      String url = myDir.getPresentableUrl();
-
-      return url != null ? url : "<invalid>";
+      return relativePath != null ? relativePath : myDir.getPresentableUrl();
     }
 
     @Override
diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java
index 6e49379f91d0..7204f61aa0ab 100644
--- a/plugins/git4idea/src/git4idea/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/GitUtil.java
@@ -79,12 +79,6 @@ public class GitUtil {
       if (o2 == null) {
         return 1;
       }
-      if (o1.getPresentableUrl() == null) {
-        return -1;
-      }
-      if (o2.getPresentableUrl() == null) {
-        return 1;
-      }
       return o1.getPresentableUrl().compareTo(o2.getPresentableUrl());
     }
   };
diff --git a/plugins/git4idea/src/git4idea/util/GitUIUtil.java b/plugins/git4idea/src/git4idea/util/GitUIUtil.java
index 1f9c3ff8330b..ae44f756a8cd 100644
--- a/plugins/git4idea/src/git4idea/util/GitUIUtil.java
+++ b/plugins/git4idea/src/git4idea/util/GitUIUtil.java
@@ -155,7 +155,7 @@ public class GitUIUtil {
     return new ListCellRendererWrapper<VirtualFile>() {
       @Override
       public void customize(final JList list, final VirtualFile file, final int index, final boolean selected, final boolean hasFocus) {
-        setText(file == null || !file.isValid() ? "(invalid)" : file.getPresentableUrl());
+        setText(file == null ? "(invalid)" : file.getPresentableUrl());
       }
     };
   }