diff --git a/Makefile b/Makefile
index 961b12f..2da1ce9 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,8 @@ clean:
 	find . -type d -name ".pytest_cache" -exec rm -rf {} +
 	find . -type d -name ".ruff_cache" -exec rm -rf {} +
 	find . -type f -name "*.pyc" -delete
+	rm -rf model_cache
+	rm -rf mlruns
 	- docker rmi $(IMAGE_NAME)
 
 install:
diff --git a/pyproject.toml b/pyproject.toml
index 2e1b5d2..271917f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "intent-service"
-version = "0.1.9"
+version = "0.1.10"
 description = "Intent classification service"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/src/api/endpoints.py b/src/api/endpoints.py
index 7f2b3f4..39f1275 100644
--- a/src/api/endpoints.py
+++ b/src/api/endpoints.py
@@ -751,10 +751,17 @@ async def predict(model_id: str, text: str) -> dict:
             os.makedirs("model_cache", exist_ok=True)
         dst_path = f"model_cache/{model_id}"
         if model_id in os.listdir("model_cache"):
+            if "intent_model" in os.listdir(dst_path):
+                dst_path = dst_path + "/intent_model"
             try:
-                loaded_model = mlflow.pyfunc.load_model(dst_path + "/intent_model")
-            except mlflow.exceptions.MlflowException as e:
-                raise HTTPException(status_code=500, detail=str(e))
+                loaded_model = mlflow.pyfunc.load_model(dst_path)
+            except mlflow.exceptions.MlflowException:
+                os.rmdir(dst_path)
+                raise HTTPException(
+                    status_code=404,
+                    detail=f"No model found with ID {model_id} (tried both registered models and runs)",
+                )
+
         else:
             os.makedirs(dst_path, exist_ok=True)
             try:
@@ -770,6 +777,7 @@ async def predict(model_id: str, text: str) -> dict:
                         dst_path=dst_path,
                     )
                 except mlflow.exceptions.MlflowException:
+                    os.rmdir(dst_path)
                     raise HTTPException(
                         status_code=404,
                         detail=f"No model found with ID {model_id} (tried both registered models and runs)",
diff --git a/uv.lock b/uv.lock
index af47647..d9a858c 100644
--- a/uv.lock
+++ b/uv.lock
@@ -637,7 +637,7 @@ wheels = [
 
 [[package]]
 name = "intent-service"
-version = "0.1.8"
+version = "0.1.9"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },