diff --git a/CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch b/CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch
new file mode 100644
index 0000000000..226831cb5b
--- /dev/null
+++ b/CraftBukkit-Patches/0023-Add-more-information-to-some-world-crashes.patch
@@ -0,0 +1,38 @@
+From f29ac022766836e78146170928e60c288decd347 Mon Sep 17 00:00:00 2001
+From: Suddenly <suddenly@suddenly.coffee>
+Date: Sat, 5 Jul 2014 16:56:44 +0100
+Subject: [PATCH] Add more information to some world crashes
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+index efdcad7..141248e 100644
+--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
++++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+@@ -54,7 +54,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+             }
+         } catch (IOException ioexception) {
+             ioexception.printStackTrace();
+-            throw new RuntimeException("Failed to check session lock, aborting");
++            throw new RuntimeException("Failed to check session lock for world located at " + this.baseDir + ", aborting. Stop the server and delete the session.lock in this world to prevent further issues."); // PaperSpigot
+         }
+     }
+ 
+@@ -69,13 +69,13 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+ 
+             try {
+                 if (datainputstream.readLong() != this.sessionId) {
+-                    throw new ExceptionWorldConflict("The save is being accessed from another location, aborting");
++                    throw new ExceptionWorldConflict("The save for world located at " + this.baseDir + " is being accessed from another location, aborting");  // PaperSpigot
+                 }
+             } finally {
+                 datainputstream.close();
+             }
+         } catch (IOException ioexception) {
+-            throw new ExceptionWorldConflict("Failed to check session lock, aborting");
++            throw new ExceptionWorldConflict("Failed to check session lock for world located at " + this.baseDir + ", aborting. Stop the server and delete the session.lock in this world to prevent further issues."); // PaperSpigot
+         }
+     }
+ 
+-- 
+1.9.1
+