diff --git a/ql/src/InconsistentCode/WrappedErrorAlwaysNil.qhelp b/ql/src/InconsistentCode/WrappedErrorAlwaysNil.qhelp
new file mode 100644
index 00000000000..8a027db4be2
--- /dev/null
+++ b/ql/src/InconsistentCode/WrappedErrorAlwaysNil.qhelp
@@ -0,0 +1,54 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+  The <code>pkg.errors</code> package provides the <code>errors.Wrap</code>
+  function for annotating an error with a stack trace. When passed
+  <code>nil</code>, this function returns <code>nil</code>.
+
+  When the first parameter to <code>errors.Wrap</code> is <emph>always</emph>
+  <code>nil</code>, the function call has no effect and likely indicates a
+  programming mistake.
+
+  A common example of this is when an <code>errors.Wrap(err, "message")</code>
+  cqll is copied from an earlier error-handling block in the same function and
+  used in a subsequent error-handling block that does not check
+  <code>err</code> in its guard. In this case the return of a <code>nil</code>
+  value to the caller indicates by convention that the operation succeeded, and
+  so the failure is masked.
+</p>
+</overview>
+
+<recommendation>
+<p>
+  Usually an <code>err</code> value is being referenced outside its intended
+  scope. The problem can be fixed by removing that reference, for example by
+  changing a call of the form <code>errors.Wrap(err, "message")</code> to
+  <code>errors.New("message")</code>.
+</p>
+</recommendation>
+
+<example>
+<p>
+  The example below shows an example where the <code>err</code> value returned
+  from the call to <code>f1</code> is reused in a later call, when it is known
+  to be <code>nil</code>:
+</p>
+
+<sample src="WrappedErrorAlwaysNil.go" />
+
+<p>
+  One way of fixing this is to create a new error value with
+  <code>errors.New</code>:
+</p>
+
+<sample src="WrappedErrorAlwaysNilGood.go" />
+</example>
+
+<references>
+<li>errors package - github.com/pkg/errors - pkg.go.dev: <a href="https://pkg.go.dev/github.com/pkg/errors#Wrap">errors.Wrap</a></li>
+</references>
+</qhelp>
diff --git a/ql/src/InconsistentCode/WrappedErrorAlwaysNilGood.go b/ql/src/InconsistentCode/WrappedErrorAlwaysNilGood.go
new file mode 100644
index 00000000000..9ce421868e7
--- /dev/null
+++ b/ql/src/InconsistentCode/WrappedErrorAlwaysNilGood.go
@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/pkg/errors"
+)
+
+func f1(input string) error {
+	if input == "1" {
+		return errors.Errorf("error in f1")
+	}
+	return nil
+}
+
+func f2(input string) (bool, error) {
+	if input == "2" {
+		return false, errors.Errorf("error in f2")
+	}
+	return true, nil
+}
+
+func test1(input string) error {
+	err := f1(input)
+	if err != nil {
+		return errors.Wrap(err, "input is the first non-negative integer")
+	}
+	if ok2, _ := f2(input); !ok2 {
+		return errors.New("input is the second non-negative integer")
+	}
+	return nil
+}