diff --git a/.travis.yml b/.travis.yml
index 2f536f9..076bcb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ after_script:
 
 deploy:
   - provider: script
-    skip_cleanup: true
+    cleanup: false
     script: curl -sL https://git.io/goreleaser | bash
     on:
       tags: true
diff --git a/githooks/pre-commit b/githooks/pre-commit
index 0e3111c..a77ca0b 100755
--- a/githooks/pre-commit
+++ b/githooks/pre-commit
@@ -4,7 +4,7 @@ set -euo pipefail
 
 git stash save --keep-index
 function restore() {
-    git stash pop
+    git stash pop || true
 }
 trap restore EXIT