diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index 6f6f0b8bda..c2053b4ccd 100755
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -46,7 +46,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed "s|\\\$(PG_SYSROOT)|$PG_SYSROOT|g"`
 # Create temp directory.
 tmp=`mktemp -d /tmp/$me.XXXXXX`
 
-trap 'rm -rf $tmp' 0 1 2 3 15
+trap 'ret=$?; rm -rf $tmp && exit $ret' 0 1 2 3 15
 
 exit_status=0