diff --git a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricServer.java b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricServer.java
index 97b1e4ab..eb34693a 100644
--- a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricServer.java
+++ b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricServer.java
@@ -403,6 +403,8 @@ public class FabricServer extends DynmapServerInterface {
             f.get();
         } catch (CancellationException cx) {
             return null;
+        } catch (InterruptedException cx) {
+            return null;
         } catch (ExecutionException xx) {
             Log.severe("Exception while loading chunks", xx.getCause());
             return null;
diff --git a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricServer.java b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricServer.java
index b2f6b05c..faa8bda5 100644
--- a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricServer.java
+++ b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricServer.java
@@ -403,6 +403,8 @@ public class FabricServer extends DynmapServerInterface {
             f.get();
         } catch (CancellationException cx) {
             return null;
+        } catch (InterruptedException cx) {
+            return null;
         } catch (ExecutionException xx) {
             Log.severe("Exception while loading chunks", xx.getCause());
             return null;
diff --git a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricServer.java b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricServer.java
index eea5816d..9c0844f3 100644
--- a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricServer.java
+++ b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricServer.java
@@ -429,6 +429,8 @@ public class FabricServer extends DynmapServerInterface {
             f.get();
         } catch (CancellationException cx) {
             return null;
+        } catch (InterruptedException cx) {
+            return null;
         } catch (ExecutionException xx) {
             Log.severe("Exception while loading chunks", xx.getCause());
             return null;
diff --git a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java
index 695074ee..ab4a1bbd 100644
--- a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java
+++ b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricServer.java
@@ -427,6 +427,8 @@ public class FabricServer extends DynmapServerInterface {
             f.get();
         } catch (CancellationException cx) {
             return null;
+        } catch (InterruptedException cx) {
+            return null;
         } catch (ExecutionException xx) {
             Log.severe("Exception while loading chunks", xx.getCause());
             return null;
diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java
index d2a64ecf..5d58d721 100644
--- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java
+++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java
@@ -412,6 +412,8 @@ public class FabricServer extends DynmapServerInterface {
             f.get();
         } catch (CancellationException cx) {
             return null;
+        } catch (InterruptedException cx) {
+            return null;
         } catch (ExecutionException xx) {
             Log.severe("Exception while loading chunks", xx.getCause());
             return null;
diff --git a/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java b/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
index 3797d479..ecd267df 100644
--- a/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
+++ b/forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
@@ -886,6 +886,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
index 0d465578..9351394e 100644
--- a/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
+++ b/forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
@@ -892,6 +892,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
index f526a79f..221e60b5 100644
--- a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
+++ b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
@@ -876,6 +876,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
index e0299f47..f6648e4c 100644
--- a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
+++ b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
@@ -899,6 +899,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
index 640ab464..7b0301a3 100644
--- a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
+++ b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
@@ -900,6 +900,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java b/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java
index 1e68928d..906d05a4 100644
--- a/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java
+++ b/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java
@@ -918,6 +918,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java b/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java
index 2c859b2c..7f405300 100644
--- a/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java
+++ b/forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java
@@ -894,6 +894,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;
diff --git a/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java b/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java
index 43beabdb..871e48b6 100644
--- a/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java
+++ b/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java
@@ -888,6 +888,9 @@ public class DynmapPlugin
             catch (CancellationException cx) {
                 return null;
             }
+            catch (InterruptedException cx) {
+                return null;
+            }
             catch (ExecutionException xx) {
                 Log.severe("Exception while loading chunks", xx.getCause());
                 return null;