diff --git a/gswrap b/gswrap
index 7009720..f900815 100644
--- a/gswrap
+++ b/gswrap
@@ -43,7 +43,7 @@ lock=$(mktemp "${TMPDIR:-/tmp}/.gswrap-XXXXXXXXXX") || exit 1
 unlock ()
 {
     test -e "$lock" || return
-    fuser -TERM "$loc"
+    fuser -TERM "$lock"
     rm -f "$lock"
 }
 
@@ -87,8 +87,8 @@ do
     opts[o++]="$dir"
     opts[o++]="$dir"
 done
-typeset -i c=0 argc=${#argv[@]}
 typeset -a argv=("$@")
+typeset -i c=0 argc=${#argv[@]}
 for ((c=0; c < argc; c++))
 do
     arg="${argv[c]}"
@@ -133,13 +133,13 @@ do
 	    elif test -n "$dir" -a -d "$dir"
 	    then
 		tmp=$(mktemp -d "$dir/.gswrap-XXXXXXXXXX") || exit 1
-		trap "finish '$dir' '$tmp'" ERR EXIT SIGINT SIGHUP
+		trap "finish '$dir' '$tmp'" EXIT SIGINT SIGHUP
 		opts[o++]=--bind
 		opts[o++]="${tmp+"$tmp"}"
 		opts[o++]="$home/out"
 	    else
 		tmp=$(mktemp -d "$PWD/.gswrap-XXXXXXXXXX") || exit 1
-		trap "finish '$PWD' '$tmp'" ERR EXIT SIGINT SIGHUP
+		trap "finish '$PWD' '$tmp'" EXIT SIGINT SIGHUP
 		opts[o++]=--bind
 		opts[o++]="${tmp+"$tmp"}"
 		opts[o++]="$home/out"
diff --git a/gswrap.changes b/gswrap.changes
index 22f8348..1e2a253 100644
--- a/gswrap.changes
+++ b/gswrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 19 14:11:05 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Fix bugs introduced by last change
+  which was ad646933d3b9ec6d767842535414b4af1020c2f7 (boo#1191683)
+
 -------------------------------------------------------------------
 Fri Oct 15 10:34:50 UTC 2021 - Dr. Werner Fink <werner@suse.de>