diff --git a/lib/response.js b/lib/response.js
index 7a2f0ecce56..54a8344b9ba 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -839,6 +839,10 @@ res.redirect = function redirect(url) {
     deprecate('Status must be a number');
   }
 
+  if (!address || typeof address !== 'string') {
+    throw new TypeError('path argument is required to res.redirect');
+  }
+
   // Set location header
   address = this.location(address).get('Location');
 
diff --git a/test/res.redirect.undefined.js b/test/res.redirect.undefined.js
new file mode 100644
index 00000000000..e16f1d683dd
--- /dev/null
+++ b/test/res.redirect.undefined.js
@@ -0,0 +1,181 @@
+'use strict'
+
+var express = require('..')
+var request = require('supertest')
+
+describe('res.redirect - Issue #6941 / #6942', function () {
+  function jsonError(err, req, res, next) {
+    res.status(500).json({
+      error: err.message,
+      type: err.name,
+      stack: Boolean(err.stack)
+    })
+  }
+
+  describe('when url is undefined', function () {
+    it('should throw a TypeError', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(undefined)
+      })
+
+      app.use(jsonError)
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          if (res.body.type !== 'TypeError') {
+            throw new Error('Expected TypeError, got ' + res.body.type)
+          }
+          if (res.body.error !== 'path argument is required to res.redirect') {
+            throw new Error('Unexpected error message: ' + res.body.error)
+          }
+          if (!res.body.stack) {
+            throw new Error('Expected error stack to be present')
+          }
+        })
+        .end(done)
+    })
+
+    it('should not send a Location header', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(undefined)
+      })
+
+      app.use(function (err, req, res, next) {
+        res.status(500).send('error')
+      })
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          // stronger than checking "undefined"
+          if ('location' in res.headers) {
+            throw new Error('Location header should not exist when redirect throws')
+          }
+        })
+        .end(done)
+    })
+  })
+
+  describe('when url is not a string', function () {
+    it('should throw a TypeError for null', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(null)
+      })
+
+      app.use(jsonError)
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          if (res.body.type !== 'TypeError') {
+            throw new Error('Expected TypeError')
+          }
+        })
+        .end(done)
+    })
+
+    it('should throw a TypeError for number (when single argument)', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(123)
+      })
+
+      app.use(jsonError)
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          if (res.body.type !== 'TypeError') {
+            throw new Error('Expected TypeError')
+          }
+        })
+        .end(done)
+    })
+
+    it('should throw a TypeError for object', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect({ url: '/home' })
+      })
+
+      app.use(jsonError)
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          if (res.body.type !== 'TypeError') {
+            throw new Error('Expected TypeError')
+          }
+        })
+        .end(done)
+    })
+  })
+
+  describe('when status and url are provided', function () {
+    it('should throw a TypeError if url is undefined', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(301, undefined)
+      })
+
+      app.use(jsonError)
+
+      request(app)
+        .get('/')
+        .expect(500)
+        .expect(function (res) {
+          if (res.body.type !== 'TypeError') {
+            throw new Error('Expected TypeError')
+          }
+          if (res.body.error !== 'path argument is required to res.redirect') {
+            throw new Error('Unexpected error message: ' + res.body.error)
+          }
+        })
+        .end(done)
+    })
+
+    it('should work correctly with valid status and url', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect(301, '/new-location')
+      })
+
+      request(app)
+        .get('/')
+        .expect('Location', '/new-location')
+        .expect(301, done)
+    })
+  })
+
+  describe('valid redirects should still work', function () {
+    it('should redirect with a string url', function (done) {
+      var app = express()
+
+      app.use(function (req, res) {
+        res.redirect('/home')
+      })
+
+      request(app)
+        .get('/')
+        .expect('Location', '/home')
+        .expect(302, done)
+    })
+  })
+})
+