diff --git a/agent/tools.py b/agent/tools.py
index ec56a8e..133e461 100644
--- a/agent/tools.py
+++ b/agent/tools.py
@@ -71,21 +71,19 @@ async def search_token(
         token: str, chain: Optional[str] = None
     ) -> Optional[TokenMetadata]:
         """Look up a token by name or symbol (e.g. "jup", "SOL", "bonk") and return its metadata including the token ID. Use this to resolve token names before calling tools that require a token ID."""
-        token: Optional[TokenMetadata] = await token_metadata_repo.search_token(
-            token, chain
-        )
-        if not token:
-            return "No token found."
-
-        return {
-            "id": f"{token.chain}:{token.address}",
-            "address": token.address,
-            "name": token.name,
-            "symbol": token.symbol,
-            "price_usd": token.price,
-            "chain": token.chain,
-        }
-
+    result: Optional[TokenMetadata] = await token_metadata_repo.search_token(
+        token, chain
+    )
+    if not result:
+        return "No token found."
+    return {
+        "id": f"{result.chain}:{result.address}",
+        "address": result.address,
+        "name": result.name,
+        "symbol": result.symbol,
+        "price_usd": result.price,
+        "chain": result.chain,
+    }
     return [
         # TVL tools
         show_defi_llama_historical_global_tvl,
diff --git a/server/config.py b/server/config.py
index 405dbe1..a02673d 100644
--- a/server/config.py
+++ b/server/config.py
@@ -2,9 +2,13 @@
 
 SKIP_TOKEN_AUTH_HEADER = os.getenv("SKIP_TOKEN_AUTH_HEADER")
 SKIP_TOKEN_AUTH_KEY = os.getenv("SKIP_TOKEN_AUTH_KEY")
-
 OG_RPC_URL: str = os.getenv("OG_RPC_URL", "https://ogevmdevnet.opengradient.ai")
 WALLET_PRIV_KEY: str = os.getenv("WALLET_PRIV_KEY")
-
 # Use OG TEE flag for LLM inference
 USE_TEE = os.getenv("USE_OG_TEE", "").lower() == "true"
+
+if not WALLET_PRIV_KEY:
+    raise EnvironmentError(
+        "WALLET_PRIV_KEY environment variable is not set. "
+        "Please set it in your .env file before starting the server."
+    )