diff --git a/src/gisaf/api.py b/src/gisaf/api.py
index 2c65c2b..43ea074 100644
--- a/src/gisaf/api.py
+++ b/src/gisaf/api.py
@@ -125,6 +125,8 @@ async def get_projects(
 async def get_feature_info(
     store: str, id: str,
     ) -> FeatureInfo:
+    if store not in registry.stores.index:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
     store_record = registry.stores.loc[store]
     model = store_record.model