diff --git a/Spigot-Server-Patches/Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/Make-the-GUI-graph-fancier.patch
index 6443afb90d..30686ddd24 100644
--- a/Spigot-Server-Patches/Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/Make-the-GUI-graph-fancier.patch
@@ -236,7 +236,7 @@ index 000000000..e463a86a6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 new file mode 100644
-index 000000000..5892c4dc1
+index 000000000..c3e54da4a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 @@ -0,0 +0,0 @@
@@ -251,6 +251,7 @@ index 000000000..5892c4dc1
 +import java.awt.Graphics;
 +import java.awt.MouseInfo;
 +import java.awt.Point;
++import java.awt.PointerInfo;
 +import java.awt.event.MouseAdapter;
 +import java.awt.event.MouseEvent;
 +import java.text.SimpleDateFormat;
@@ -312,13 +313,18 @@ index 000000000..5892c4dc1
 +        Runtime jvm = Runtime.getRuntime();
 +        DATA.add(new GraphData(jvm.totalMemory(), jvm.freeMemory(), jvm.maxMemory()));
 +
-+        Point scr = MouseInfo.getPointerInfo().getLocation();
-+        Point loc = new Point(scr);
-+        SwingUtilities.convertPointFromScreen(loc, this);
-+        if (this.contains(loc)) {
-+            ToolTipManager.sharedInstance().mouseMoved(
-+                new MouseEvent(this, -1, System.currentTimeMillis(), 0, loc.x, loc.y,
-+                    scr.x, scr.y, 0, false, 0));
++        PointerInfo pointerInfo = MouseInfo.getPointerInfo();
++        if (pointerInfo != null) {
++            Point point = pointerInfo.getLocation();
++            if (point != null) {
++                Point loc = new Point(point);
++                SwingUtilities.convertPointFromScreen(loc, this);
++                if (this.contains(loc)) {
++                    ToolTipManager.sharedInstance().mouseMoved(
++                        new MouseEvent(this, -1, System.currentTimeMillis(), 0, loc.x, loc.y,
++                            point.x, point.y, 0, false, 0));
++                }
++            }
 +        }
 +
 +        currentTick++;