diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md
index 8518b4cca..732ce6d31 100644
--- a/build_runner/CHANGELOG.md
+++ b/build_runner/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 2.3.1
 
-- Allow `frontend_servier_client` version 3.
+- Upgrade to `frontend_service_client` version 3.
 
 ## 2.3.0
 
diff --git a/build_runner/lib/src/build_script_generate/bootstrap.dart b/build_runner/lib/src/build_script_generate/bootstrap.dart
index 97bb290d8..364dbd189 100644
--- a/build_runner/lib/src/build_script_generate/bootstrap.dart
+++ b/build_runner/lib/src/build_script_generate/bootstrap.dart
@@ -165,13 +165,11 @@ Future<int> _createKernelIfNeeded(Logger logger) async {
     await logTimedAsync(logger, 'Precompiling build script...', () async {
       try {
         final result = await client.compile();
-        hadErrors = result == null ||
-            result.errorCount > 0 ||
-            !(await kernelCacheFile.exists());
+        hadErrors = result.errorCount > 0 || !(await kernelCacheFile.exists());
 
         // Note: We're logging all output with a single log call to keep
         // annotated source spans intact.
-        final logOutput = result?.compilerOutputLines.join('\n');
+        final logOutput = result.compilerOutputLines.join('\n');
         if (logOutput != null && logOutput.isNotEmpty) {
           hadOutput = true;
           if (hadErrors) {
diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
index f282338b3..f3e014fa2 100644
--- a/build_runner/pubspec.yaml
+++ b/build_runner/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   collection: ^1.15.0
   crypto: ^3.0.0
   dart_style: ^2.0.0
-  frontend_server_client: ">=2.1.0 <4.0.0"
+  frontend_server_client: ^3.0.0
   glob: ^2.0.0
   graphs: ^2.0.0
   http_multi_server: ^3.0.0