diff --git a/doc/api/errors.md b/doc/api/errors.md
index 500fb7801b61fd..56032ca3ad3359 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -1665,12 +1665,6 @@ An attempt to renegotiate the TLS session failed.
 
 An attempt was made to renegotiate TLS on a socket instance with TLS disabled.
 
-<a id="ERR_TLS_REQUIRED_SERVER_NAME"></a>
-### ERR_TLS_REQUIRED_SERVER_NAME
-
-While using TLS, the `server.addContext()` method was called without providing
-a hostname in the first parameter.
-
 <a id="ERR_TLS_SESSION_ATTACK"></a>
 ### ERR_TLS_SESSION_ATTACK
 
@@ -2030,6 +2024,15 @@ removed: v10.0.0
 
 Used when a TLS renegotiation request has failed in a non-specific way.
 
+<a id="ERR_TLS_REQUIRED_SERVER_NAME"></a>
+### ERR_TLS_REQUIRED_SERVER_NAME
+<!-- YAML
+removed: REPLACEME
+-->
+
+While using TLS, the `server.addContext()` method was called without providing
+a hostname in the first parameter.
+
 <a id="ERR_UNKNOWN_BUILTIN_MODULE"></a>
 ### ERR_UNKNOWN_BUILTIN_MODULE
 <!-- YAML
diff --git a/doc/api/tls.md b/doc/api/tls.md
index 5bda2f26c0af33..534ce68ac0b72e 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -347,18 +347,18 @@ called:
 * `tlsSocket` {tls.TLSSocket} The `tls.TLSSocket` instance from which the
   error originated.
 
-### server.addContext(hostname, context)
+### server.addContext(servername, context)
 <!-- YAML
 added: v0.5.3
 -->
 
-* `hostname` {string} A SNI hostname or wildcard (e.g. `'*'`)
+* `servername` {string} A SNI hostname or wildcard (e.g. `'*'`)
 * `context` {Object} An object containing any of the possible properties
   from the [`tls.createSecureContext()`][] `options` arguments (e.g. `key`,
   `cert`, `ca`, etc).
 
 The `server.addContext()` method adds a secure context that will be used if
-the client request's SNI name matches the supplied `hostname` (or wildcard).
+the client request's SNI name matches the supplied `severname` (or wildcard).
 
 ### server.address()
 <!-- YAML
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 2e32366028ef71..4c5ced8326b390 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -39,13 +39,13 @@ const { owner_symbol } = require('internal/async_hooks').symbols;
 const { SecureContext: NativeSecureContext } = internalBinding('crypto');
 const {
   ERR_INVALID_ARG_TYPE,
+  ERR_MISSING_ARGS,
   ERR_MULTIPLE_CALLBACK,
   ERR_SOCKET_CLOSED,
   ERR_TLS_DH_PARAM_SIZE,
   ERR_TLS_HANDSHAKE_TIMEOUT,
   ERR_TLS_RENEGOTIATE,
   ERR_TLS_RENEGOTIATION_DISABLED,
-  ERR_TLS_REQUIRED_SERVER_NAME,
   ERR_TLS_SESSION_ATTACK,
   ERR_TLS_SNI_FROM_SERVER
 } = require('internal/errors').codes;
@@ -1051,7 +1051,7 @@ Server.prototype.setOptions = util.deprecate(function(options) {
 // SNI Contexts High-Level API
 Server.prototype.addContext = function(servername, context) {
   if (!servername) {
-    throw new ERR_TLS_REQUIRED_SERVER_NAME();
+    throw new ERR_MISSING_ARGS('servername');
   }
 
   var re = new RegExp('^' +
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 5fec67d6c721af..c1879d3f93d9e8 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -864,10 +864,8 @@ E('ERR_TLS_HANDSHAKE_TIMEOUT', 'TLS handshake timeout', Error);
 E('ERR_TLS_RENEGOTIATE', 'Attempt to renegotiate TLS session failed', Error);
 E('ERR_TLS_RENEGOTIATION_DISABLED',
   'TLS session renegotiation disabled for this socket', Error);
-
-// This should probably be a `TypeError`.
 E('ERR_TLS_REQUIRED_SERVER_NAME',
-  '"servername" is required parameter for Server.addContext', Error);
+  '"servername" is a required parameter', TypeError);
 E('ERR_TLS_SESSION_ATTACK', 'TLS session renegotiation attack detected', Error);
 E('ERR_TLS_SNI_FROM_SERVER',
   'Cannot issue SNI from a TLS server-side socket', Error);
diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js
index 073e95988a3a08..a48ba0b4306be4 100644
--- a/test/parallel/test-tls-sni-server-client.js
+++ b/test/parallel/test-tls-sni-server-client.js
@@ -84,6 +84,13 @@ const clientsOptions = [{
 const serverResults = [];
 const clientResults = [];
 
+// check for throwing case where servername is not supplied
+common.expectsError(tls.createServer(serverOptions, () => {}).addContext, {
+  type: TypeError,
+  code: 'ERR_MISSING_ARGS',
+  message: 'The "servername" argument must be specified'
+});
+
 const server = tls.createServer(serverOptions, function(c) {
   serverResults.push(c.servername);
 });