diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 97ad3d4a43..ca61675359 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -535,7 +535,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
         if(mode == breaking){
             Effects.effect(Fx.tapBlock, cursor.worldx(), cursor.worldy(), 1f);
-        }else{
+        }else if(recipe != null){
             Effects.effect(Fx.tapBlock, cursor.worldx() + recipe.result.offset(), cursor.worldy() + recipe.result.offset(), recipe.result.size);
         }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
index 38cec398f8..e2c226a348 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
@@ -127,7 +127,7 @@ public class MechPad extends Block{
 
         if(checkValidTap(tile, player)){
             Call.onMechFactoryTap(player, tile);
-        }else if(player.isLocal && mobile){
+        }else if(player.isLocal && mobile && !player.isDead()){
             player.moveTarget = tile.entity;
         }
     }