diff --git a/chopper/CHANGELOG.md b/chopper/CHANGELOG.md
index 6af68839..1ae2764f 100644
--- a/chopper/CHANGELOG.md
+++ b/chopper/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.3
+
+- Fix for authenticator usage
+- Null-safety fixes
+
 ## 4.0.1
 
 - Fix for the null safety support
diff --git a/chopper/lib/src/base.dart b/chopper/lib/src/base.dart
index be1d720e..1be36cb3 100644
--- a/chopper/lib/src/base.dart
+++ b/chopper/lib/src/base.dart
@@ -315,6 +315,13 @@ class ChopperClient {
 
       if (updatedRequest != null) {
         res = await send<BodyType, InnerType>(updatedRequest);
+        // To prevent double call with typed response
+        if (_responseIsSuccessful(res.statusCode)) {
+          return _processResponse(res);
+        } else {
+          res = await _handleErrorResponse<BodyType, InnerType>(res);
+          return _processResponse(res);
+        }
       }
     }
 
@@ -327,10 +334,13 @@ class ChopperClient {
       res = await _handleErrorResponse<BodyType, InnerType>(res);
     }
 
-    res = await _interceptResponse<BodyType, InnerType>(res);
+    return _processResponse(res);
+  }
 
+  Future<Response<BodyType>> _processResponse<BodyType, InnerType>(
+      dynamic res) async {
+    res = await _interceptResponse<BodyType, InnerType>(res);
     _responseController.add(res);
-
     return res;
   }
 
diff --git a/chopper/lib/src/response.dart b/chopper/lib/src/response.dart
index 5b0e99c8..e4d9a56f 100644
--- a/chopper/lib/src/response.dart
+++ b/chopper/lib/src/response.dart
@@ -40,7 +40,7 @@ class Response<BodyType> {
   }) =>
       Response<NewBodyType>(
         base ?? this.base,
-        body ?? (this.body as NewBodyType),
+        body ?? (this.body as NewBodyType?),
         error: bodyError ?? error,
       );
 
diff --git a/chopper/lib/src/utils.dart b/chopper/lib/src/utils.dart
index 4e68b350..21b0605f 100644
--- a/chopper/lib/src/utils.dart
+++ b/chopper/lib/src/utils.dart
@@ -91,7 +91,7 @@ Iterable<_Pair<String, String>> _iterableToQuery(
 ) =>
     values.map((v) => _Pair(name, _normalizeValue(v)));
 
-String _normalizeValue(value) => Uri.encodeQueryComponent(value.toString());
+String _normalizeValue(value) => Uri.encodeComponent(value.toString());
 
 class _Pair<A, B> {
   final A first;
diff --git a/chopper/pubspec.yaml b/chopper/pubspec.yaml
index 70d13169..eef79174 100644
--- a/chopper/pubspec.yaml
+++ b/chopper/pubspec.yaml
@@ -1,6 +1,6 @@
 name: chopper
 description: Chopper is an http client generator using source_gen, inspired by Retrofit
-version: 4.0.1
+version: 4.0.3
 documentation: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper
 author: Hadrien Lejard <hadrien.lejard@gmail.com>
diff --git a/chopper_generator/CHANGELOG.md b/chopper_generator/CHANGELOG.md
index 41173021..4c36fe03 100644
--- a/chopper_generator/CHANGELOG.md
+++ b/chopper_generator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.3
+
+- Interpolation fixes
+
 ## 4.0.2
 
 - Analyzer dependency upgrade
diff --git a/chopper_generator/lib/src/generator.dart b/chopper_generator/lib/src/generator.dart
index 40f722f6..19630d2f 100644
--- a/chopper_generator/lib/src/generator.dart
+++ b/chopper_generator/lib/src/generator.dart
@@ -366,7 +366,7 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
     var path = getMethodPath(method);
     paths.forEach((p, ConstantReader r) {
       final name = r.peek('name')?.stringValue ?? p.displayName;
-      path = path.replaceFirst('{$name}', '\$${p.displayName}');
+      path = path.replaceFirst('{$name}', '\${${p.displayName}}');
     });
 
     if (path.startsWith('http://') || path.startsWith('https://')) {
diff --git a/chopper_generator/pubspec.yaml b/chopper_generator/pubspec.yaml
index 708c683c..78beea6b 100644
--- a/chopper_generator/pubspec.yaml
+++ b/chopper_generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: chopper_generator
 description: Chopper is an http client generator using source_gen, inspired by Retrofit
-version: 4.0.2
+version: 4.0.3
 documentation: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper
 author: Hadrien Lejard <hadrien.lejard@gmail.com>