diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
index 9f9ad0543..7804ea281 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
@@ -164,7 +164,12 @@ public class ExpireManager {
                     String filename = null;
                     if (PlotMain.checkVersion()) {
                         foldername = "playerdata";
-                        filename = uuid.toString() + ".dat";
+                        try {
+                            filename = op.getUniqueId() +".dat";
+                        }
+                        catch (Throwable e) {
+                            filename = uuid.toString() + ".dat";
+                        }
                     }
                     else {
                         foldername = "players";