diff --git a/docs/index.md b/docs/index.md
index e459a5fd..528b9404 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -93,6 +93,7 @@
   - [isValidSecret](#isvalidsecret)
   - [deriveKeypair](#derivekeypair)
   - [deriveAddress](#deriveaddress)
+  - [generateFaucetWallet](#generatefaucetwallet)
   - [signPaymentChannelClaim](#signpaymentchannelclaim)
   - [verifyPaymentChannelClaim](#verifypaymentchannelclaim)
   - [computeLedgerHash](#computeledgerhash)
@@ -6091,6 +6092,38 @@ This method returns a string corresponding to the address derived from the publi
 var address = api.deriveAddress(public_key);
 ```
 
+## generateFaucetWallet
+
+`generateFaucetWallet(onTestnet = true)`
+
+Calls the Testnet or Devnet faucet API in order to generate a new, random wallet with some amount of test XRP. This is for testing purposes only.
+
+### Example
+
+**Request**
+
+Create a new wallet on the Testnet:
+
+```javascript
+const wallet = await api.generateFaucetWallet()
+```
+
+**Response**
+
+
+```json
+{
+    "account": {
+        "xAddress": "T7i2Q8yGcMcCQa2n6d9EvSEptT4CE6ap7Q1r1fmjstkLfsK",
+        "secret": "ssKCsaRqWh669atvv83bdYRaiHomY",
+        "classicAddress": "r9SYfmVxrb7iuCVfNhW2gqqzapfE2r6juG",
+        "address": "r9SYfmVxrb7iuCVfNhW2gqqzapfE2r6juG"
+    },
+    "amount": 1000,
+    "balance": 1000
+}
+```
+
 ## signPaymentChannelClaim
 
 `signPaymentChannelClaim(channel: string, amount: string, privateKey: string): string`
@@ -6426,6 +6459,7 @@ The flags are called [AccountSet flags (asf*)](https://xrpl.org/accountset.html#
 `RippleAPI.accountSetFlags.globalFreeze`:	Freeze all assets issued by this account.
 `RippleAPI.accountSetFlags.defaultRipple`: Enable [rippling](https://xrpl.org/rippling.html) on this account's trust lines by default.
 `RippleAPI.accountSetFlags.depositAuth`:Enable Deposit Authorization on this account.
+
 ## schemaValidator
 
 Unlike the rest of the ripple-lib API, schemaValidator is a static object on RippleAPI. It provides utility methods that do not use a server.
diff --git a/docs/src/generateFaucetWallet.md.ejs b/docs/src/generateFaucetWallet.md.ejs
new file mode 100644
index 00000000..f40f2974
--- /dev/null
+++ b/docs/src/generateFaucetWallet.md.ejs
@@ -0,0 +1,19 @@
+## generateFaucetWallet
+
+`generateFaucetWallet(onTestnet = true)`
+
+Calls the Testnet or Devnet faucet API in order to generate a new, random wallet with some amount of test XRP. This is for testing purposes only.
+
+### Example
+
+**Request**
+
+Create a new wallet on the Testnet:
+
+```javascript
+const wallet = await api.generateFaucetWallet()
+```
+
+**Response**
+
+<%- renderFixture('responses/generate-faucet-wallet.json') %>
\ No newline at end of file
diff --git a/docs/src/index.md.ejs b/docs/src/index.md.ejs
index 59e4a491..92ff4937 100644
--- a/docs/src/index.md.ejs
+++ b/docs/src/index.md.ejs
@@ -59,6 +59,7 @@
 <%- include('isValidSecret.md.ejs') %>
 <%- include('deriveKeypair.md.ejs') %>
 <%- include('deriveAddress.md.ejs') %>
+<%- include('generateFaucetWallet.md.ejs') %>
 <%- include('signPaymentChannelClaim.md.ejs') %>
 <%- include('verifyPaymentChannelClaim.md.ejs') %>
 <%- include('computeLedgerHash.md.ejs') %>
diff --git a/src/wallet/wallet-generation.ts b/src/wallet/wallet-generation.ts
index 7c26fb31..68253cf0 100644
--- a/src/wallet/wallet-generation.ts
+++ b/src/wallet/wallet-generation.ts
@@ -4,6 +4,7 @@ import {RippleAPI} from '..'
 import {errors} from '../common'
 import {GeneratedAddress} from '../offline/generate-address'
 import {isValidAddress} from '../common/schema-validator'
+import {RippledError} from '../common/errors'
 
 export interface FaucetWallet {
   account: GeneratedAddress
@@ -29,6 +30,9 @@ async function generateFaucetWallet(
   this: RippleAPI,
   address?: string
 ): Promise<FaucetWallet | void> {
+  if(!this.isConnected())
+    throw new RippledError("RippleAPI not connected, cannot call faucet")
+
   // Initialize some variables
   let body: Uint8Array
   let startingBalance = 0
diff --git a/test/fixtures/responses/generate-faucet-wallet.json b/test/fixtures/responses/generate-faucet-wallet.json
new file mode 100644
index 00000000..a9f0414b
--- /dev/null
+++ b/test/fixtures/responses/generate-faucet-wallet.json
@@ -0,0 +1,10 @@
+{
+    "account": {
+        "xAddress": "T7i2Q8yGcMcCQa2n6d9EvSEptT4CE6ap7Q1r1fmjstkLfsK",
+        "secret": "ssKCsaRqWh669atvv83bdYRaiHomY",
+        "classicAddress": "r9SYfmVxrb7iuCVfNhW2gqqzapfE2r6juG",
+        "address": "r9SYfmVxrb7iuCVfNhW2gqqzapfE2r6juG"
+    },
+    "amount": 1000,
+    "balance": 1000
+}
\ No newline at end of file
diff --git a/test/fixtures/responses/index.js b/test/fixtures/responses/index.js
index 18646f3e..c7ef6842 100644
--- a/test/fixtures/responses/index.js
+++ b/test/fixtures/responses/index.js
@@ -218,5 +218,6 @@ module.exports = {
     single: require('./combine')
   },
   submit: require('./submit'),
-  ledgerEvent: require('./ledger-event')
+  ledgerEvent: require('./ledger-event'),
+  generateFaucetWallet: require('./generate-faucet-wallet.json')
 };