diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 4ad2b3485..19c90fff0 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -788,6 +788,8 @@ class RPC:
             timerange=timerange_parsed,
             data_format=config.get('dataformat_ohlcv', 'json'),
         )
+        if pair not in _data:
+            raise RPCException(f"No data for {pair}, {timeframe} in {timerange} found.")
         from freqtrade.resolvers.strategy_resolver import StrategyResolver
         strategy = StrategyResolver.load_strategy(config)
         df_analyzed = strategy.analyze_ticker(_data[pair], {'pair': pair})
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index f6e0ccd76..dfb0fb956 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -1046,6 +1046,14 @@ def test_api_pair_history(botclient, ohlcv_history):
     assert rc.json()['data_stop'] == '2018-01-12 00:00:00+00:00'
     assert rc.json()['data_stop_ts'] == 1515715200000
 
+    # No data found
+    rc = client_get(client,
+                    f"{BASE_URI}/pair_history?pair=UNITTEST%2FBTC&timeframe={timeframe}"
+                    "&timerange=20200111-20200112&strategy=DefaultStrategy")
+    assert_response(rc, 502)
+    assert rc.json()['error'] == ("Error querying /api/v1/pair_history: "
+                                  "No data for UNITTEST/BTC, 5m in 20200111-20200112 found.")
+
 
 def test_api_plot_config(botclient):
     ftbot, client = botclient