Merge branch 'fillOrderAsync' into addEventSubscriptions

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

1 files changed, 3 insertions, 0 deletions

diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 2894c5a9f..f32cb88a6 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -180,6 +180,9 @@ export class ExchangeWrapper extends ContractWrapper {
         if (fillAmount.greaterThan(takerBalance)) {
             throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_BALANCE);
         }
+        if (fillAmount.greaterThan(takerAllowance)) {
+            throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_ALLOWANCE);
+        }
     }
     private throwErrorLogsAsErrors(logs: ContractEvent[]): void {
         const errEvent = _.find(logs, {event: 'LogError'});