diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 6b95975f2be2ada43dbb7e079e2fa4dc9fca1aa3..d137ac0d3d16194a17b5358ec9cf3a6ee96e2e45 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -228,7 +228,7 @@ struct vars
 	struct subre *tree;			/* subexpression tree */
 	struct subre *treechain;	/* all tree nodes allocated */
 	struct subre *treefree;		/* any free tree nodes */
-	int			ntree;			/* number of tree nodes */
+	int			ntree;			/* number of tree nodes, plus one */
 	struct cvec *cv;			/* interface cvec */
 	struct cvec *cv2;			/* utility cvec */
 	struct subre *lacons;		/* lookahead-constraint vector */
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index efd1e9ba02261621f45d0ab60a5d9495d77a8fd4..8505994747f367fb72342bf1fd9f852f28a9703e 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -348,7 +348,11 @@ find(struct vars * v,
 						   (chr **) NULL, &hitend);
 		else
 			end = longest(v, d, begin, v->stop, &hitend);
-		NOERR();
+		if (ISERR())
+		{
+			freedfa(d);
+			return v->err;
+		}
 		if (hitend && cold == NULL)
 			cold = begin;
 		if (end != NULL)
diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h
index 94e06f041b70a373b61b793d1d375c873a306740..fccaf298bf1328caea336caea4ac8ccaab6033f6 100644
--- a/src/include/regex/regguts.h
+++ b/src/include/regex/regguts.h
@@ -467,7 +467,7 @@ struct guts
 	size_t		nsub;			/* copy of re_nsub */
 	struct subre *tree;
 	struct cnfa search;			/* for fast preliminary search */
-	int			ntree;			/* number of subre's, less one */
+	int			ntree;			/* number of subre's, plus one */
 	struct colormap cmap;
 	int			FUNCPTR(compare, (const chr *, const chr *, size_t));
 	struct subre *lacons;		/* lookahead-constraint vector */