diff --git a/core/src/exchanges/baozi/normalizer.ts b/core/src/exchanges/baozi/normalizer.ts
index 6afc42f..fdb24c4 100644
--- a/core/src/exchanges/baozi/normalizer.ts
+++ b/core/src/exchanges/baozi/normalizer.ts
@@ -1,5 +1,6 @@
 import { MarketFetchParams } from '../../BaseExchange';
 import { UnifiedMarket, UnifiedEvent, PriceCandle, OrderBook, Trade, Position, Balance } from '../../types';
+import { NotFound } from '../../errors';
 import { IExchangeNormalizer } from '../interfaces';
 import {
     LAMPORTS_PER_SOL,
@@ -88,12 +89,12 @@ export class BaoziNormalizer implements IExchangeNormalizer<BaoziRawMarket, Baoz
 
     normalizeOrderBook(raw: BaoziRawMarket | null, outcomeId: string): OrderBook {
         if (!raw) {
-            throw new Error(`Market not found for outcome: ${outcomeId}`);
+            throw new NotFound(`Market not found for outcome: ${outcomeId}`, 'Baozi');
         }
 
         const market = this.normalizeMarket(raw);
         if (!market) {
-            throw new Error(`Could not parse market for outcome: ${outcomeId}`);
+            throw new NotFound(`Could not parse market for outcome: ${outcomeId}`, 'Baozi');
         }
 
         const outcome = market.outcomes.find(o => o.outcomeId === outcomeId);
diff --git a/core/src/exchanges/kalshi/fetcher.ts b/core/src/exchanges/kalshi/fetcher.ts
index 1922424..f4746a6 100644
--- a/core/src/exchanges/kalshi/fetcher.ts
+++ b/core/src/exchanges/kalshi/fetcher.ts
@@ -1,6 +1,7 @@
 import { MarketFilterParams, EventFetchParams, OHLCVParams, TradesParams, MyTradesParams } from '../../BaseExchange';
 import { IExchangeFetcher, FetcherContext } from '../interfaces';
 import { kalshiErrorMapper } from './errors';
+import { NotFound } from '../../errors';
 import { validateIdFormat } from '../../utils/validation';
 import { mapIntervalToKalshi } from './utils';
 
@@ -253,6 +254,10 @@ export class KalshiFetcher implements IExchangeFetcher<KalshiRawEvent, KalshiRaw
         validateIdFormat(id, 'OrderBook');
         const ticker = id.replace(/-NO$/, '');
         const data = await this.ctx.callApi('GetMarketOrderbook', { ticker });
+        const book = data.orderbook_fp;
+        if (!book || (!book.yes_dollars?.length && !book.no_dollars?.length)) {
+            throw new NotFound(`Order book not found: ${id}`, 'Kalshi');
+        }
         return data;
     }
 
diff --git a/core/src/exchanges/limitless/fetcher.ts b/core/src/exchanges/limitless/fetcher.ts
index 1d413cb..929b79f 100644
--- a/core/src/exchanges/limitless/fetcher.ts
+++ b/core/src/exchanges/limitless/fetcher.ts
@@ -170,7 +170,7 @@ export class LimitlessFetcher implements IExchangeFetcher<LimitlessRawMarket, Li
                 timestamp: data.timestamp,
             };
         } catch (error: any) {
-            return { bids: [], asks: [] };
+            throw limitlessErrorMapper.mapError(error);
         }
     }
 
diff --git a/sdks/python/scripts/generate-client-methods.js b/sdks/python/scripts/generate-client-methods.js
index 62b1343..51b0d5c 100644
--- a/sdks/python/scripts/generate-client-methods.js
+++ b/sdks/python/scripts/generate-client-methods.js
@@ -34,6 +34,7 @@ const SKIP_GENERATE = new Set([
     'fetchTrades',               // special parameter handling
     'watchOrderBook',            // streaming
     'watchTrades',               // streaming
+    'watchAddress',              // streaming
     'createOrder',               // outcome shorthand logic
     'buildOrder',                // complex args format
     'submitOrder',               // complex args format
diff --git a/sdks/typescript/scripts/generate-client-methods.js b/sdks/typescript/scripts/generate-client-methods.js
index 60765c4..3ff8d83 100644
--- a/sdks/typescript/scripts/generate-client-methods.js
+++ b/sdks/typescript/scripts/generate-client-methods.js
@@ -33,6 +33,7 @@ const SKIP_GENERATE = new Set([
     'fetchTrades',               // resolution parameter handling
     'watchOrderBook',            // streaming
     'watchTrades',               // streaming
+    'watchAddress',              // streaming
     'createOrder',               // outcome shorthand logic
     'buildOrder',                // complex args format, returns BuiltOrder
     'getExecutionPrice',         // delegates to getExecutionPriceDetailed