diff --git a/PICable.py b/PICable.py
index 85b0ddf..39a6d69 100644
--- a/PICable.py
+++ b/PICable.py
@@ -73,21 +73,12 @@ def get_lines_of_code(owner, repository):
     return number_of_lines_of_code
 
 
-def is_valid_repository(owner, repository, request_headers):
-    repository_url = f"https://api.github.com/repos/{owner}/{repository}"
-    repository_response = requests.get(repository_url, headers=request_headers)
-    return repository_response.status_code == 200
-
-
 def PICable(owner, repository, token):
     margin_percentage = round(MARGIN * 100)
     request_headers = {"Authorization": f"token {token}"}
     picable_report = f"Analysis complete for the repository {owner}/{repository}.\n\n"
     repository_url = f"https://www.github.com/{owner}/{repository}"
 
-    if not is_valid_repository(owner, repository, request_headers):
-        return f"Invalid repository: {owner}/{repository} :x:"
-
     stars = get_stars_info(owner, repository, request_headers)
     if stars == -1:
         return "Error fetching stars info. :x:"
diff --git a/main.py b/main.py
index ca50168..9136b37 100644
--- a/main.py
+++ b/main.py
@@ -69,6 +69,13 @@ async def picable(interaction: Interaction, owner: str, repository: str):
     url = f"https://api.github.com/repos/{owner}/{repository}"
     headers = {"Authorization": f"token {github_token}"}
     response = requests.get(url, headers=headers)
+
+    if not response.status_code == 200:
+        await interaction.followup.send(
+            f"Invalid Repository. Please check the repository name and owner and try again. :x:"
+        )
+        return
+
     response.raise_for_status()
     repo_info = response.json()
     repository_size_kb = repo_info["size"]