diff --git a/patches/7923_draft.diff b/patches/7923_draft.diff
index beac77e..527a43c 100644
--- a/patches/7923_draft.diff
+++ b/patches/7923_draft.diff
@@ -1,22 +1,36 @@
 diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
-index a72abd44ef..199ffad108 100644
+index a72abd44ef..72e8bd68ec 100644
 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
 +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
-@@ -423,7 +423,7 @@ public final class MoveRefactoring extends CodeRefactoring {
+@@ -420,18 +420,26 @@ public final class MoveRefactoring extends CodeRefactoring {
+         }
+ 
+         private static Project getSelectedProject(NamedPath selectedProject) {
++            String path = selectedProject == null ? null : selectedProject.getPath();
++            if (path == null) {
++                return null;
++            }
++            FileObject file;
              try {
-                 String path = selectedProject.getPath();
-                 return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
--            } catch (MalformedURLException ex) {
-+            } catch (MalformedURLException | NullPointerException ex) {
-                 return null;
+-                String path = selectedProject.getPath();
+-                return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
++                file = Utils.fromUri(path);
+             } catch (MalformedURLException ex) {
+-                return null;
++                file = null;
              }
++            return file == null ? null : FileOwnerQuery.getOwner(file);
          }
-@@ -432,7 +432,7 @@ public final class MoveRefactoring extends CodeRefactoring {
+ 
+         private static FileObject getSelectedRoot(NamedPath selectedRoot) {
++            String path = selectedRoot == null ? null : selectedRoot.getPath();
++            if (path == null) {
++                return null;
++            }
              try {
-                 String path = selectedRoot.getPath();
-                 return path != null ? Utils.fromUri(path) : null;
--            } catch (MalformedURLException ex) {
-+            } catch (MalformedURLException | NullPointerException ex) {
+-                String path = selectedRoot.getPath();
+-                return path != null ? Utils.fromUri(path) : null;
++                return Utils.fromUri(path);
+             } catch (MalformedURLException ex) {
                  return null;
              }
-         }