From 7a424b239f4ae67a823d218a3379900ac9700001 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Mon, 14 Oct 2019 13:10:20 +0300
Subject: [PATCH] NPE

GitOrigin-RevId: fc1b052019b7639d06ee15650335b16e617e01fb
---
 xml/xml-psi-api/src/com/intellij/javaee/UriUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/xml-psi-api/src/com/intellij/javaee/UriUtil.java b/xml/xml-psi-api/src/com/intellij/javaee/UriUtil.java
index df8eb9712223..3d6afe82d3da 100644
--- a/xml/xml-psi-api/src/com/intellij/javaee/UriUtil.java
+++ b/xml/xml-psi-api/src/com/intellij/javaee/UriUtil.java
@@ -38,7 +38,7 @@ public class UriUtil {
   public static VirtualFile findRelative(String uri, @NotNull PsiFileSystemItem base) {
     String location = ExternalResourceManager.getInstance().getResourceLocation(uri, base.getProject());
     VirtualFile file = base.getVirtualFile();
-    return VfsUtilCore.findRelativeFile(location, file.isValid() ? file : null);
+    return VfsUtilCore.findRelativeFile(location, file != null && file.isValid() ? file : null);
   }
 
   // cannot use UriUtil.SLASH_MATCHER.trimFrom - we don't depend on guava