diff --git a/Plugins/Nautilus.Game.Arcade.UHC.WorldGen/src/nautilus/game/arcade/uhc/WorldGen.java b/Plugins/Nautilus.Game.Arcade.UHC.WorldGen/src/nautilus/game/arcade/uhc/WorldGen.java
index da1bfe3a0..debfeea29 100644
--- a/Plugins/Nautilus.Game.Arcade.UHC.WorldGen/src/nautilus/game/arcade/uhc/WorldGen.java
+++ b/Plugins/Nautilus.Game.Arcade.UHC.WorldGen/src/nautilus/game/arcade/uhc/WorldGen.java
@@ -258,9 +258,9 @@ public class WorldGen extends JavaPlugin implements Runnable, Listener
 		FileUtils.deleteQuietly(worldFolder);
 
 		RequestConfig config = RequestConfig.custom()
-			.setConnectTimeout(TIMEOUT)
-			.setSocketTimeout(TIMEOUT)
-			.build();
+				.setConnectTimeout(TIMEOUT)
+				.setSocketTimeout(TIMEOUT)
+				.build();
 
 		CloseableHttpClient httpClient = HttpClientBuilder.create()
 				.setDefaultRequestConfig(config)
@@ -277,12 +277,33 @@ public class WorldGen extends JavaPlugin implements Runnable, Listener
 
 		try
 		{
+			getLogger().info("Uploading " + seed + "!");
 			HttpResponse response = httpClient.execute(request);
 
-			if (response.getStatusLine().getStatusCode() != 200) {
-				getLogger().severe("Failed to upload " + seed + ": " + response.getStatusLine().getStatusCode() + " " + response.getStatusLine().getReasonPhrase());
-			} else {
+			if (response.getStatusLine().getStatusCode() != 200)
+			{
+				if (response.getStatusLine().getStatusCode() == 409)
+				{
+					getLogger().warning("Oops - Server rejected " + seed + " because it was already generated");
+
+					if (!outputFile.delete())
+					{
+						getLogger().warning("Could not clean up " + seed);
+					}
+				}
+				else
+				{
+					getLogger().severe("Failed to upload " + seed + ": " + response.getStatusLine().getStatusCode() + " " + response.getStatusLine().getReasonPhrase());
+				}
+			}
+			else
+			{
 				getLogger().info("Uploaded " + seed + "!");
+
+				if (!outputFile.delete())
+				{
+					getLogger().warning("Could not clean up " + seed);
+				}
 			}
 		}
 		catch (IOException e)