diff --git a/debian/client/common/usr/lib/minecraft-pi/pre-launch.sh b/debian/client/common/usr/lib/minecraft-pi/pre-launch.sh
index 5c8f8778..a660ef83 100755
--- a/debian/client/common/usr/lib/minecraft-pi/pre-launch.sh
+++ b/debian/client/common/usr/lib/minecraft-pi/pre-launch.sh
@@ -21,7 +21,7 @@ RET=$?
 set -e
 
 # Kill Logging
-kill ${TAIL_PID}
+kill ${TAIL_PID} > /dev/null 2>&1 || :
 
 # Exit
 exit ${RET}
\ No newline at end of file
diff --git a/debian/client/native/usr/lib/minecraft-pi/run.sh b/debian/client/native/usr/lib/minecraft-pi/run.sh
index 39dee336..b55bfb8b 100755
--- a/debian/client/native/usr/lib/minecraft-pi/run.sh
+++ b/debian/client/native/usr/lib/minecraft-pi/run.sh
@@ -3,4 +3,4 @@
 set -e
 
 # Launch Minecraft
-docker-compose -f "${DOCKER_COMPOSE_YML}" run --rm minecraft-pi
\ No newline at end of file
+exec docker-compose -f "${DOCKER_COMPOSE_YML}" run --rm minecraft-pi
\ No newline at end of file
diff --git a/debian/client/virgl/usr/lib/minecraft-pi/run.sh b/debian/client/virgl/usr/lib/minecraft-pi/run.sh
index 685a824d..30b43b61 100755
--- a/debian/client/virgl/usr/lib/minecraft-pi/run.sh
+++ b/debian/client/virgl/usr/lib/minecraft-pi/run.sh
@@ -13,6 +13,7 @@ RET=$?
 set -e
 
 # Kill VirGL
-kill ${VIRGL_PID} > /dev/null 2>&1
+kill ${VIRGL_PID} > /dev/null 2>&1 || :
 
+# Exit
 exit ${RET}
\ No newline at end of file