diff --git a/Server/src/main/java/net/simon987/server/assembly/Assembler.java b/Server/src/main/java/net/simon987/server/assembly/Assembler.java
index b6f5f8b..151f952 100755
--- a/Server/src/main/java/net/simon987/server/assembly/Assembler.java
+++ b/Server/src/main/java/net/simon987/server/assembly/Assembler.java
@@ -132,7 +132,7 @@ public class Assembler {
 
         //System.out.println(line);
 
-        if (line.substring(0, 2).toUpperCase().equals("DW")) {
+        if (line.length() >= 2 && line.substring(0, 2).toUpperCase().equals("DW")) {
 
             try {