diff --git a/bridge_ui/src/components/NumberTextField.tsx b/bridge_ui/src/components/NumberTextField.tsx
index 7ba8fc037..4ea918da4 100644
--- a/bridge_ui/src/components/NumberTextField.tsx
+++ b/bridge_ui/src/components/NumberTextField.tsx
@@ -5,18 +5,19 @@ import {
   TextFieldProps,
 } from "@material-ui/core";
 
-export default function NumberTextField(
-  props: TextFieldProps & { onMaxClick?: () => void }
-) {
+export default function NumberTextField({
+  onMaxClick,
+  ...props
+}: TextFieldProps & { onMaxClick?: () => void }) {
   return (
     <TextField
       type="number"
       {...props}
       InputProps={{
-        endAdornment: props.onMaxClick ? (
+        endAdornment: onMaxClick ? (
           <InputAdornment position="end">
             <Button
-              onClick={props.onMaxClick}
+              onClick={onMaxClick}
               disabled={props.disabled}
               variant="outlined"
             >
diff --git a/bridge_ui/src/components/Transfer/Source.tsx b/bridge_ui/src/components/Transfer/Source.tsx
index f1b1c9028..40be69132 100644
--- a/bridge_ui/src/components/Transfer/Source.tsx
+++ b/bridge_ui/src/components/Transfer/Source.tsx
@@ -150,7 +150,11 @@ function Source() {
               value={amount}
               onChange={handleAmountChange}
               disabled={shouldLockFields}
-              onMaxClick={uiAmountString ? handleMaxClick : undefined}
+              onMaxClick={
+                uiAmountString && !parsedTokenAccount.isNativeAsset
+                  ? handleMaxClick
+                  : undefined
+              }
             />
           ) : null}
           <ButtonWithLoader
diff --git a/bridge_ui/src/utils/parseError.ts b/bridge_ui/src/utils/parseError.ts
index 4fa63a89c..f3bd11bdb 100644
--- a/bridge_ui/src/utils/parseError.ts
+++ b/bridge_ui/src/utils/parseError.ts
@@ -3,6 +3,8 @@ const MM_ERR_WITH_INFO_START =
 const parseError = (e: any) =>
   e?.data?.message?.startsWith(MM_ERR_WITH_INFO_START)
     ? e.data.message.replace(MM_ERR_WITH_INFO_START, "")
+    : e?.response?.data?.error // terra error
+    ? e.response.data.error
     : e?.message
     ? e.message
     : "An unknown error occurred";
diff --git a/bridge_ui/src/utils/terra.ts b/bridge_ui/src/utils/terra.ts
index 9e1914161..b3ef70d3f 100644
--- a/bridge_ui/src/utils/terra.ts
+++ b/bridge_ui/src/utils/terra.ts
@@ -40,6 +40,12 @@ export async function waitForTerraExecution(transaction: TxResult) {
       console.error(e);
     }
   }
+  if (info.code !== undefined) {
+    // error code
+    throw new Error(
+      `Tx ${transaction.result.txhash}: error code ${info.code}: ${info.raw_log}`
+    );
+  }
   return info;
 }
 
@@ -62,30 +68,31 @@ export async function postWithFees(
   msgs: any[],
   memo: string
 ) {
-  try {
-    const lcd = new LCDClient(TERRA_HOST);
-    //let gasPrices = await lcd.config.gasPrices //Unsure if the values returned from this are hardcoded or not.
-    //Thus, we are going to pull it directly from the current FCD.
-    let gasPrices = await axios
-      .get(TERRA_GAS_PRICES_URL)
-      .then((result) => result.data);
+  // don't try/catch, let errors propagate
+  const lcd = new LCDClient(TERRA_HOST);
+  //let gasPrices = await lcd.config.gasPrices //Unsure if the values returned from this are hardcoded or not.
+  //Thus, we are going to pull it directly from the current FCD.
+  let gasPrices = await axios
+    .get(TERRA_GAS_PRICES_URL)
+    .then((result) => result.data);
 
-    const feeEstimate = await lcd.tx.estimateFee(
-      wallet.walletAddress,
-      [...msgs],
-      { memo, feeDenoms: ["uluna"], gasPrices }
-    );
-
-    const result = await wallet.post({
-      msgs: [...msgs],
+  const feeEstimate = await lcd.tx.estimateFee(
+    wallet.walletAddress,
+    [...msgs],
+    {
       memo,
       feeDenoms: ["uluna"],
       gasPrices,
-      fee: feeEstimate,
-    });
+    }
+  );
 
-    return result;
-  } catch (e) {
-    return Promise.reject();
-  }
+  const result = await wallet.post({
+    msgs: [...msgs],
+    memo,
+    feeDenoms: ["uluna"],
+    gasPrices,
+    fee: feeEstimate,
+  });
+
+  return result;
 }