diff --git a/src/mappings/markets.ts b/src/mappings/markets.ts
index 8805788..fd6c043 100644
--- a/src/mappings/markets.ts
+++ b/src/mappings/markets.ts
@@ -97,10 +97,11 @@ function getUSDCpriceETH(blockNumber: i32): BigDecimal {
       : tryPrice.value.toBigDecimal().div(bdFactorUSDC)
   } else {
     let oracle1 = PriceOracle.bind(priceOracle1Address)
-    usdPrice = oracle1
-      .getPrice(Address.fromString(USDCAddress))
-      .toBigDecimal()
-      .div(mantissaFactorBD)
+    let tryPrice = oracle1.try_getPrice(Address.fromString(USDCAddress))
+
+    usdPrice = tryPrice.reverted
+      ? zeroBD
+      : tryPrice.value.toBigDecimal().div(mantissaFactorBD)
   }
   return usdPrice
 }
@@ -127,8 +128,10 @@ export function createMarket(marketAddress: string): Market {
     let underlyingContract = ERC20.bind(market.underlyingAddress as Address)
     market.underlyingDecimals = underlyingContract.decimals()
     if (market.underlyingAddress.toHexString() != daiAddress) {
-      market.underlyingName = underlyingContract.name()
-      market.underlyingSymbol = underlyingContract.symbol()
+      let tryname = underlyingContract.try_name()
+      let trysymbol = underlyingContract.try_symbol()
+      market.underlyingName = tryname.reverted ? '' : tryname.value
+      market.underlyingSymbol = trysymbol.reverted ? '' : trysymbol.value
     } else {
       market.underlyingName = 'Dai Stablecoin v1.0 (DAI)'
       market.underlyingSymbol = 'DAI'
@@ -150,10 +153,12 @@ export function createMarket(marketAddress: string): Market {
   market.interestRateModelAddress = interestRateModelAddress.reverted
     ? Address.fromString('0x0000000000000000000000000000000000000000')
     : interestRateModelAddress.value
-  market.name = contract.name()
+  let tryMarketName = contract.try_name()
+  market.name = tryMarketName.reverted ? '' : tryMarketName.value
   market.reserves = zeroBD
   market.supplyRate = zeroBD
-  market.symbol = contract.symbol()
+  let tryMarketSymbol = contract.try_symbol()
+  market.symbol = tryMarketSymbol.reverted ? '' : tryMarketSymbol.value
   market.totalBorrows = zeroBD
   market.totalSupply = zeroBD