From 085f29f76cc220f469fea93f30171a35f2c85811 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Thu, 8 Oct 2020 13:58:21 +0200
Subject: [PATCH] cosmwasm: Handle other null cases in LCD query

---
 packages/cosmwasm/src/lcdapi/wasm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cosmwasm/src/lcdapi/wasm.ts b/packages/cosmwasm/src/lcdapi/wasm.ts
index 88940a56..0a2c041c 100644
--- a/packages/cosmwasm/src/lcdapi/wasm.ts
+++ b/packages/cosmwasm/src/lcdapi/wasm.ts
@@ -160,7 +160,7 @@ export function setupWasmExtension(base: LcdClient): WasmExtension {
         const path = `/wasm/contract/${address}/raw/${hexKey}?encoding=hex`;
         const responseData = (await base.get(path)) as WasmResponse<WasmData[]>;
         const data = unwrapWasmResponse(responseData);
-        return data.length === 0 ? null : fromBase64(data[0].val);
+        return data === null || data.length === 0 || data[0] === undefined ? null : fromBase64(data[0].val);
       },
       queryContractSmart: async (address: string, query: Record<string, unknown>) => {
         const encoded = toHex(toUtf8(JSON.stringify(query)));