diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index 0e9a9535066987bd1da48b1a6eacb258c32a0058..38614834182778384171b27f849202b156ed3f60 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -50,6 +50,7 @@ keep_net_alive & KEEP_NET_ALIVE_PID=$!
 cleanup_keep_net_alive () {
 	[ -e /proc/$KEEP_NET_ALIVE_PID ] && kill $KEEP_NET_ALIVE_PID
 }
+trap cleanup_keep_net_alive EXIT
 
 is_element_of () {
 	testelt=$1
@@ -1632,4 +1633,5 @@ fi
 create_partitions
 populate_boot
 populate_rootfs
+exit 0
 #