diff --git a/lib/buy/robinhood/robinhood_buy_provider.dart b/lib/buy/robinhood/robinhood_buy_provider.dart
index 937af0315..b44fab311 100644
--- a/lib/buy/robinhood/robinhood_buy_provider.dart
+++ b/lib/buy/robinhood/robinhood_buy_provider.dart
@@ -59,7 +59,7 @@ class RobinhoodBuyProvider extends BuyProvider {
       case WalletType.bitcoinCash:
         return await wallet.signMessage(message, address: wallet.walletAddresses.address);
       default:
-        throw Exception("WalletType is not available for Robinhood ${wallet.type}");
+        throw Exception("Wallet Type ${wallet.type.name} is not available for Robinhood");
     }
   }
 
diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart
index f5f96a8cd..3fbbe0709 100644
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@@ -32,33 +32,56 @@ class AddressResolver {
 
   static const unstoppableDomains = [
     "888",
+    "academy",
+    "agency",
     "altimist",
     "anime",
     "austin",
     "bald",
+    "bay",
     "benji",
     "bet",
     "binanceus",
     "bitcoin",
     "bitget",
+    "bitscrunch",
     "blockchain",
+    "boomer",
+    "boston",
     "ca",
+    "caw",
+    "cc",
+    "chat",
     "chomp",
     "clay",
+    "club",
     "co",
     "com",
+    "company",
     "crypto",
     "dao",
+    "design",
     "dfz",
     "digital",
+    "doga",
+    "donut",
     "dream",
+    "email",
+    "emir",
     "eth",
     "ethermail",
+    "family",
     "farms",
+    "finance",
     "fun",
+    "fyi",
+    "games",
+    "global",
     "go",
     "group",
+    "guru",
     "hi",
+    "hockey",
     "host",
     "info",
     "io",
@@ -68,43 +91,78 @@ class AddressResolver {
     "lfg",
     "life",
     "live",
+    "llc",
+    "ltc",
     "ltd",
     "manga",
+    "me",
+    "media",
     "metropolis",
+    "miami",
+    "miku",
+    "money",
     "moon",
     "mumu",
     "net",
+    "network",
+    "news",
     "nft",
+    "npc",
+    "onchain",
     "online",
     "org",
+    "podcast",
     "pog",
     "polygon",
     "press",
+    "privacy",
     "pro",
     "propykeys",
     "pudgy",
     "pw",
+    "quantum",
+    "rad",
     "raiin",
+    "retardio",
+    "rip",
+    "rocks",
     "secret",
+    "services",
     "site",
     "smobler",
+    "social",
+    "solutions",
     "space",
     "stepn",
     "store",
+    "studio",
+    "systems",
     "tball",
+    "tea",
+    "team",
     "tech",
+    "technology",
+    "today",
+    "tribe",
+    "u",
     "ubu",
     "uno",
     "unstoppable",
+    "vip",
     "wallet",
     "website",
+    "wif",
     "wifi",
     "witg",
+    "work",
+    "world",
     "wrkx",
+    "wtf",
     "x",
     "xmr",
     "xyz",
     "zil",
+    "zone"
   ];
 
   static String? extractAddressByType({required String raw, required CryptoCurrency type}) {