diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml
index 87a8896..92913c2 100644
--- a/kubernetes-manifests/loadgenerator.yaml
+++ b/kubernetes-manifests/loadgenerator.yaml
@@ -15,7 +15,7 @@ spec:
       - name: wait-frontend
         image: alpine:3.6
         command: ['sh', '-c', 'set -x;  apk add --no-cache curl; 
-          until curl -f "http://${FRONTEND_ADDR}"; do 
+          until timeout -t 2 curl -f "http://${FRONTEND_ADDR}"; do 
             echo "waiting for http://${FRONTEND_ADDR}"; 
             sleep 2;
           done;']
diff --git a/src/loadgenerator/loadgen.sh b/src/loadgenerator/loadgen.sh
index 5021e29..92af14b 100755
--- a/src/loadgenerator/loadgen.sh
+++ b/src/loadgenerator/loadgen.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+trap "exit" TERM
 
 if [[ -z "${FRONTEND_ADDR}" ]]; then
     echo >&2 "FRONTEND_ADDR not specified"