diff --git a/Changelog.txt b/Changelog.txt
index 7c6d6aade..d0f26a381 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,8 @@
+Version 2.1.117
+    Fixed a rare http error when polling Mojang for UUIDs
+    Fixed a bug that allowed duping
+
+
 Version 2.1.116
     Fixed directional plants not maintaining their direction when replanted
 
diff --git a/pom.xml b/pom.xml
index 0c2f79be8..d41267bcb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.117-SNAPSHOT</version>
+    <version>2.1.117</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
index 00853db63..4d4f9eb8e 100644
--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
@@ -147,7 +147,7 @@ public class MiningManager extends SkillManager {
                 ores.add(blockState);
             }
             //Server bug that allows beacons to be duped when yield is set to 0
-            else if(blockState.getType() != Material.BEACON) {
+            else if(blockState.getType() != Material.BEACON && blockState.getType() != Material.SHULKER_BOX) {
                 debris.add(blockState);
             }
         }
diff --git a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
index 4ddf909af..9c9f19cf6 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
@@ -43,12 +43,18 @@ public final class ParticleEffectUtils {
             return;
         }
 
+        if(location.getWorld() == null)
+            return;
+
         location.getWorld().playEffect(location, Effect.MOBSPAWNER_FLAMES, 1);
     }
 
     public static void playSmokeEffect(Location location) {
         World world = location.getWorld();
 
+        if(world == null)
+            return;
+
         // Have to do it this way, because not all block directions are valid for smoke
         world.playEffect(location, Effect.SMOKE, BlockFace.SOUTH_EAST);
         world.playEffect(location, Effect.SMOKE, BlockFace.SOUTH);