diff --git a/codeflash/code_utils/env_utils.py b/codeflash/code_utils/env_utils.py
index d74c03135..1d16bd404 100644
--- a/codeflash/code_utils/env_utils.py
+++ b/codeflash/code_utils/env_utils.py
@@ -66,9 +66,12 @@ def ensure_codeflash_api_key() -> bool:
 @lru_cache(maxsize=1)
 def get_pr_number() -> Optional[int]:
     pr_number = os.environ.get("CODEFLASH_PR_NUMBER")
-    if not pr_number:
-        return None
-    return int(pr_number)
+    if pr_number:
+        try:
+            return int(pr_number)
+        except ValueError:
+            return None
+    return None
 
 
 def ensure_pr_number() -> bool:
diff --git a/codeflash/optimization/optimizer.py b/codeflash/optimization/optimizer.py
index e0bd487fd..5b9d7d3ca 100644
--- a/codeflash/optimization/optimizer.py
+++ b/codeflash/optimization/optimizer.py
@@ -311,14 +311,13 @@ def run_with_args(args: Namespace) -> None:
 
 def is_pr_draft() -> bool:
     """Check if the PR is draft. in the github action context."""
-    try:
-        event_path = os.getenv("GITHUB_EVENT_PATH")
-        pr_number = get_pr_number()
-        if pr_number is not None and event_path:
-            with Path(event_path).open() as f:
+    pr_number = get_pr_number()
+    event_path = os.environ.get("GITHUB_EVENT_PATH")
+    if pr_number is not None and event_path:
+        try:
+            with open(event_path) as f:
                 event_data = json.load(f)
             return event_data["pull_request"]["draft"]
-        return False  # noqa
-    except Exception as e:
-        logger.warning(f"Error checking if PR is draft: {e}")
-        return False
+        except Exception as e:
+            logger.warning(f"Error checking if PR is draft: {e}")
+    return False