diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java
index 9c21f976..990555ae 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java
@@ -77,7 +77,7 @@ public class EndSign extends DSign {
 
     @Override
     public void onTrigger() {
-        for (DGamePlayer dPlayer : plugin.getDPlayers().getDGamePlayers()) {
+        for (DGamePlayer dPlayer : DGamePlayer.getByWorld(getGameWorld().getWorld())) {
             dPlayer.finish();
         }
     }
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java
index 721b03c9..cae8e769 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java
@@ -250,8 +250,12 @@ public class RedstoneSign extends DSign {
 
         unpower();
 
-        enableTask.cancel();
-        disableTask.cancel();
+        if (enableTask != null) {
+            enableTask.cancel();
+        }
+        if (disableTask != null) {
+            disableTask.cancel();
+        }
 
         active = false;
     }
diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java b/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java
index df94c3e7..7d1ac506 100644
--- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java
+++ b/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java
@@ -108,7 +108,7 @@ public abstract class Trigger {
     }
 
     public void updateDSigns() {
-        for (DSign dSign : dSigns) {
+        for (DSign dSign : dSigns.toArray(new DSign[dSigns.size()])) {
             dSign.onUpdate();
         }
     }