diff --git a/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol b/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
index 9db005daf4..e05a407ad3 100644
--- a/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
+++ b/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
@@ -492,6 +492,6 @@ contract MixinExchangeWrapper is
         pure
         returns (bool)
     {
-        return order.makerFeeAssetData.readBytes4(0) == EXCHANGE_V2_ORDER_ID;
+        return order.makerFeeAssetData.length > 3 && order.makerFeeAssetData.readBytes4(0) == EXCHANGE_V2_ORDER_ID;
     }
 }
diff --git a/yarn.lock b/yarn.lock
index bd4639be17..596b623b34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7897,7 +7897,7 @@ ganache-cli@6.8.0-istanbul.0:
     source-map-support "0.5.12"
     yargs "13.2.4"
 
-ganache-core@2.9.0-istanbul.0, ganache-core@^2.9.0-istanbul.0:
+ganache-core@^2.9.0-istanbul.0:
   version "2.9.0-istanbul.0"
   resolved "https://registry.npmjs.org/ganache-core/-/ganache-core-2.9.0-istanbul.0.tgz#bc336c770775a2b9fb06f5cae827088ecc194283"
   integrity sha512-wqNWyxrfZe4QPxzaR/n4hGxIfa1iZAkymPg17wET0iWZ9uurMywGgpG4ZvxjVU9q7WCjIobOSzE1m9OT0dIYcQ==