diff --git a/lib/httpserver/httpserver.go b/lib/httpserver/httpserver.go
index 739b31d911..ca4f77f386 100644
--- a/lib/httpserver/httpserver.go
+++ b/lib/httpserver/httpserver.go
@@ -455,6 +455,13 @@ type ErrorWithStatusCode struct {
 	StatusCode int
 }
 
+// Unwrap returns e.Err.
+//
+// This is used by standard errors package. See https://golang.org/pkg/errors
+func (e *ErrorWithStatusCode) Unwrap() error {
+	return e.Err
+}
+
 // Error implements error interface.
 func (e *ErrorWithStatusCode) Error() string {
 	return e.Err.Error()