diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java
index 69d9ba61e8..82add253a9 100644
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/BuildBlock.java
@@ -337,6 +337,7 @@ public class BuildBlock extends Block{
         }
 
         public void setDeconstruct(Block previous){
+            if(previous == null) return;
             this.previous = previous;
             this.progress = 1f;
             if(previous.buildCost >= 0.01f){
diff --git a/desktop/build.gradle b/desktop/build.gradle
index efedf8c57b..d03320d394 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -33,7 +33,7 @@ task run(dependsOn: classes, type: JavaExec){
     }
 
     if(args.contains("debug")){
-        main = "io.anuke.mindustry.DebugLauncher"
+        main = "mindustry.debug.DebugLauncher"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 29c1e50fad..5404911090 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=88c1a9afe2f5be4dd06e47ac8afe070247b3da29
+archash=6e94de8eaa000725ad8f959009358cf010d6db01