diff --git a/scripts/common.sh b/scripts/common.sh
index dabad591def6ef187af57687b15fb21422cfc29c..26f68f8856a8770f13f51d6c8435e838df646ea4 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # $1: source package name
 # $2: distribution
 function get_sources() {
@@ -39,9 +41,8 @@ function dch_custom() {
 }
 
 function dch_backport() {
-	local version, name
-	version=$(cat /etc/os-release | grep VERSION_ID= | sed -E 's/.*([0-9]+).*/\1/')
-	name=$(cat /etc/os-release | grep VERSION= | sed 's/.*(\(.*\)).*/\1/')
+	local version=$(cat /etc/os-release | grep VERSION_ID= | sed -E 's/.*([0-9]+).*/\1/')
+	local name=$(cat /etc/os-release | grep VERSION= | sed 's/.*(\(.*\)).*/\1/')
 	debchange --local ~bpo$version+ --distribution $name-backports "Rebuild for $name-backports."
 }