diff --git a/src/commitpkg.in b/src/commitpkg.in
index 2f0ea1f..ef30544 100644
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -136,13 +136,13 @@ if [[ -n $(svn status -q) ]]; then
 		msgfile=$(mktemp --tmpdir="${WORKDIR}" commitpkg.XXXXXXXXXX)
 		echo "$msgtemplate" > "$msgfile"
 		if [[ -n $SVN_EDITOR ]]; then
-			$SVN_EDITOR "$msgfile"
+			$SVN_EDITOR "$msgfile" || die
 		elif [[ -n $VISUAL ]]; then
-			$VISUAL "$msgfile"
+			$VISUAL "$msgfile" || die
 		elif [[ -n $EDITOR ]]; then
-			$EDITOR "$msgfile"
+			$EDITOR "$msgfile" || die
 		else
-			vi "$msgfile"
+			vi "$msgfile" || die
 		fi
 		[[ -s $msgfile ]] || die
 		stat_busy 'Committing changes to trunk'