diff --git a/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandScript.java b/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandScript.java
index 0cb792b6..ab498513 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandScript.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandScript.java
@@ -18,7 +18,6 @@ package de.erethon.dungeonsxl.sign.windup;
 
 import de.erethon.dungeonsxl.DungeonsXL;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -31,7 +30,7 @@ public class CommandScript {
 
     private String name;
     private File file;
-    private List<String> commands = new ArrayList<>();
+    private List<String> commands;
 
     public CommandScript(String name, List<String> commands, Permission permission) {
         this.name = name;
@@ -45,10 +44,7 @@ public class CommandScript {
 
         name = file.getName().replace(".yml", "");
         this.file = file;
-
-        if (config.getStringList("commands") != null) {
-            setCommands(config.getStringList("commands"));
-        }
+        setCommands(config.getStringList("commands"));
     }
 
     public String getName() {
diff --git a/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandSign.java b/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandSign.java
index 3e7b4641..1b1197cc 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandSign.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandSign.java
@@ -86,6 +86,7 @@ public class CommandSign extends Windup {
 
     @Override
     public void initialize() {
+        script = ((DungeonsXL) api).getCommandScriptRegistry().get(getLine(1));
         String[] attributes = getLine(2).split(",");
 
         if (attributes.length == 3) {