diff --git a/languageserver/src/context-providers/secrets.ts b/languageserver/src/context-providers/secrets.ts
index d369ce4..7c4efb3 100644
--- a/languageserver/src/context-providers/secrets.ts
+++ b/languageserver/src/context-providers/secrets.ts
@@ -2,10 +2,13 @@ import {data, DescriptionDictionary} from "@github/actions-expressions";
 import {StringData} from "@github/actions-expressions/data/string";
 import {Mode} from "@github/actions-languageservice/context-providers/default";
 import {WorkflowContext} from "@github/actions-languageservice/context/workflow-context";
+import {warn} from "@github/actions-languageservice/log";
 import {isMapping, isString} from "@github/actions-workflow-parser";
 import {Octokit} from "@octokit/rest";
+
 import {RepositoryContext} from "../initializationOptions";
 import {TTLCache} from "../utils/cache";
+import {errorStatus} from "../utils/error";
 import {getRepoPermission} from "../utils/repo-permission";
 
 export async function getSecrets(
@@ -153,6 +156,10 @@ async function fetchEnvironmentSecrets(
       response => response.data.map(secret => new StringData(secret.name))
     );
   } catch (e) {
+    if (errorStatus(e) === 404) {
+      warn(`Environment ${environmentName} not found`);
+      return [];
+    }
     console.log("Failure to retrieve environment secrets: ", e);
     throw e;
   }
diff --git a/languageserver/src/context-providers/variables.ts b/languageserver/src/context-providers/variables.ts
index b590406..46516e2 100644
--- a/languageserver/src/context-providers/variables.ts
+++ b/languageserver/src/context-providers/variables.ts
@@ -1,11 +1,14 @@
 import {data, DescriptionDictionary} from "@github/actions-expressions";
+import {Pair} from "@github/actions-expressions/data/expressiondata";
+import {StringData} from "@github/actions-expressions/data/index";
 import {WorkflowContext} from "@github/actions-languageservice/context/workflow-context";
+import {warn} from "@github/actions-languageservice/log";
 import {isMapping, isString} from "@github/actions-workflow-parser";
 import {Octokit} from "@octokit/rest";
-import {Pair} from "@github/actions-expressions/data/expressiondata";
+
 import {RepositoryContext} from "../initializationOptions";
-import {StringData} from "@github/actions-expressions/data/index";
 import {TTLCache} from "../utils/cache";
+import {errorStatus} from "../utils/error";
 import {getRepoPermission} from "../utils/repo-permission";
 
 export async function getVariables(
@@ -151,6 +154,10 @@ async function fetchEnvironmentVariables(
         })
     );
   } catch (e) {
+    if (errorStatus(e) === 404) {
+      warn(`Environment ${environmentName} not found`);
+      return [];
+    }
     console.log("Failure to retrieve environment variables: ", e);
     throw e;
   }