Merge branch 'fillOrderAsync' into unavailableFilledCancelled

# Conflicts:
#	src/0x.js.ts
#	test/exchange_wrapper_test.ts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 0e9d71586..967c81ed8 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -130,9 +130,9 @@ export class ZeroEx {
     /**
      * Get the default account set for sending transactions.
      */
-    public async getTransactionSenderAccountAsync(): Promise<string> {
-        const senderAccount = await this.web3Wrapper.getSenderAddressOrThrowAsync();
-        return senderAccount;
+    public async getTransactionSenderAccountIfExistsAsync(): Promise<string|undefined> {
+        const senderAccountIfExists = await this.web3Wrapper.getSenderAddressIfExistsAsync();
+        return senderAccountIfExists;
     }
     /**
      * Computes the orderHash given the order parameters and returns it as a hex encoded string.