diff --git a/codecov_cli/commands/upload.py b/codecov_cli/commands/upload.py
index ebb75876b..7e747527e 100644
--- a/codecov_cli/commands/upload.py
+++ b/codecov_cli/commands/upload.py
@@ -261,8 +261,8 @@ def do_upload(
 ):
     with sentry_sdk.start_transaction(op="task", name="Do Upload"):
         with sentry_sdk.start_span(name="do_upload"):
-            versioning_system = ctx.obj["versioning_system"]
-            codecov_yaml = ctx.obj["codecov_yaml"] or {}
+            versioning_system = ctx.obj.get("versioning_system")
+            codecov_yaml = ctx.obj.get("codecov_yaml") or {}
             cli_config = codecov_yaml.get("cli", {})
             ci_adapter = ctx.obj.get("ci_adapter")
             enterprise_url = ctx.obj.get("enterprise_url")
diff --git a/codecov_cli/commands/upload_coverage.py b/codecov_cli/commands/upload_coverage.py
index 4e0defffb..c3d7e029f 100644
--- a/codecov_cli/commands/upload_coverage.py
+++ b/codecov_cli/commands/upload_coverage.py
@@ -77,8 +77,8 @@ def upload_coverage(
             report_type = report_type_from_str(report_type_str)
 
             if not use_legacy_uploader and report_type == ReportType.COVERAGE:
-                versioning_system = ctx.obj["versioning_system"]
-                codecov_yaml = ctx.obj["codecov_yaml"] or {}
+                versioning_system = ctx.obj.get("versioning_system")
+                codecov_yaml = ctx.obj.get("codecov_yaml") or {}
                 cli_config = codecov_yaml.get("cli", {})
                 ci_adapter = ctx.obj.get("ci_adapter")
                 enterprise_url = ctx.obj.get("enterprise_url")
diff --git a/codecov_cli/fallbacks.py b/codecov_cli/fallbacks.py
index 099b391db..d3f760d91 100644
--- a/codecov_cli/fallbacks.py
+++ b/codecov_cli/fallbacks.py
@@ -3,6 +3,8 @@
 
 import click
 
+from codecov_cli.branding import Branding
+
 
 class FallbackFieldEnum(Enum):
     branch = auto()
@@ -66,8 +68,13 @@ def get_default(
 class BrandedOption(click.Option):
     def resolve_envvar_value(self, ctx: click.Context) -> typing.Optional[str]:
         actual_var = self.envvar
+        branding = (
+            ctx.obj.get("branding", [Branding.CODECOV])
+            if ctx.obj is not None
+            else [Branding.CODECOV]
+        )
         self.envvar = [
-            f"{brand.value.upper()}_{actual_var}" for brand in ctx.obj["branding"]
+            f"{brand.value.upper()}_{actual_var}" for brand in branding
         ]
         res = super().resolve_envvar_value(ctx)
         self.envvar = actual_var