nodejs
diff --git a/‎lib/internal/crypto/keygen.js‎
Lines changed: 2 additions & 2 deletions b/‎lib/internal/crypto/keygen.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/parallel/test-crypto-keygen.js‎
Lines changed: 15 additions & 0 deletions b/‎test/parallel/test-crypto-keygen.js‎
Lines changed: 15 additions & 0 deletions
@@ -209,11 +209,11 @@ const nidOnlyKeyPairs = {
 function createJob(mode, type, options) {
   validateString(type, 'type');
 
-  const encoding = new SafeArrayIterator(parseKeyEncoding(type, options));
-
   if (options !== undefined)
     validateObject(options, 'options');
 
+  const encoding = new SafeArrayIterator(parseKeyEncoding(type, options));
+
   switch (type) {
     case 'rsa':
     case 'rsa-pss':
 
@@ -89,6 +89,21 @@ const isBoringSSL = process.features.openssl_is_boringssl;
     message: 'The "options" argument must be of type object. ' +
       'Received type number (0)'
   });
+
+  for (const type of ['rsa', 'ed25519']) {
+    assert.throws(() => generateKeyPairSync(type, null), {
+      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
+      message: 'The "options" argument must be of type object. ' +
+        'Received null'
+    });
+    assert.throws(() => generateKeyPair(type, null, common.mustNotCall()), {
+      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
+      message: 'The "options" argument must be of type object. ' +
+        'Received null'
+    });
+  }
 }
 
 {