diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 2e84150e2..1e59449ff 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -4,8 +4,7 @@
 set -e
 
 # Debugging shizz
-trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-trap 'if [ $? -ne 0 ]; then echo "\"${last_command}\" command filed with exit code $?."; fi' EXIT
+trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COMMAND}\" failed in \"${FUNCNAME}\" with exit code ${ERRCODE}."; fi' EXIT
 
 OS_VERSION=$(cat /etc/os-release | grep "^VERSION_ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g')
diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh
index 70c42c516..6a31c66f9 100755
--- a/pkg/mac/build.sh
+++ b/pkg/mac/build.sh
@@ -6,8 +6,7 @@
 set -e -E
 
 # Debugging shizz
-trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-trap 'if [ $? -ne 0 ]; then echo "\"${last_command}\" command filed with exit code $?."; fi' EXIT
+trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COMMAND}\" failed in \"${FUNCNAME}\" with exit code ${ERRCODE}."; fi' EXIT
 
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 SOURCE_DIR=$(realpath ${SCRIPT_DIR}/../..)
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 0b1e31cc8..929554e84 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -4,8 +4,7 @@
 set -e
 
 # Debugging shizz
-trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-trap 'if [ $? -ne 0 ]; then echo "\"${last_command}\" command filed with exit code $?."; fi' EXIT
+trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COMMAND}\" failed in \"${FUNCNAME}\" with exit code ${ERRCODE}."; fi' EXIT
 
 OS_VERSION=$(cat /etc/os-release | grep "^VERSION_ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g')