diff --git a/recipe_modules/build_util/api.py b/recipe_modules/build_util/api.py
index 10292f3..589ee05 100644
--- a/recipe_modules/build_util/api.py
+++ b/recipe_modules/build_util/api.py
@@ -50,7 +50,7 @@
     """
     self._initialize()
     build_dir = checkout_path.join('out/%s' % config)
-    goma_jobs = self.m.properties['goma_jobs']
+    goma_jobs = self.m.properties.get('goma_jobs', '200')
     ninja_args = [tool, '-j', goma_jobs, '-C', build_dir]
     ninja_args.extend(targets)
     self.m.goma.set_path(self.m.goma.goma_dir)
diff --git a/recipe_modules/shard_util_v2/api.py b/recipe_modules/shard_util_v2/api.py
index 92e0e31..bad74e1 100644
--- a/recipe_modules/shard_util_v2/api.py
+++ b/recipe_modules/shard_util_v2/api.py
@@ -220,7 +220,7 @@
       platform_name = build.get('platform') or PLATFORM_TO_NAME.get(
           self.m.platform.name
       )
-      environment = drone_properties['environment']
+      environment = drone_properties.get('environment')
       environment = '%s ' % environment if environment else ''
       builder_name = build.get(
           'drone_builder_name',