diff --git a/generate-tar b/generate-tar
index d90aefa..f0b94a9 100755
--- a/generate-tar
+++ b/generate-tar
@@ -124,6 +124,7 @@
 
 
 scratch_dir=`mktemp -d`
+trap "{ rm -r ${scratch_dir}; }" EXIT
 
 if [[ "${do_sign}" == true ]]; then
   if [[ -z "${private_key_path}" ]]; then
@@ -243,4 +244,3 @@
   echo "Static layout tarball at $outfile"
 fi
 
-rm -r "${scratch_dir}"