diff --git a/yoti-sdk-auth/src/main/java/com/yoti/auth/CreateAuthenticationTokenResponse.java b/yoti-sdk-auth/src/main/java/com/yoti/auth/CreateAuthenticationTokenResponse.java
index 9d437c72..3f4cb439 100644
--- a/yoti-sdk-auth/src/main/java/com/yoti/auth/CreateAuthenticationTokenResponse.java
+++ b/yoti-sdk-auth/src/main/java/com/yoti/auth/CreateAuthenticationTokenResponse.java
@@ -1,10 +1,19 @@
 package com.yoti.auth;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public final class CreateAuthenticationTokenResponse {
 
+    @JsonProperty("access_token")
     private String accessToken;
+
+    @JsonProperty("token_type")
     private String tokenType;
+
+    @JsonProperty("expires_in")
     private Integer expiresIn;
+
+    @JsonProperty("scope")
     private String scope;
 
     /**
diff --git a/yoti-sdk-auth/src/main/java/com/yoti/auth/FormRequestClient.java b/yoti-sdk-auth/src/main/java/com/yoti/auth/FormRequestClient.java
index fbb46372..becfc1dd 100644
--- a/yoti-sdk-auth/src/main/java/com/yoti/auth/FormRequestClient.java
+++ b/yoti-sdk-auth/src/main/java/com/yoti/auth/FormRequestClient.java
@@ -59,14 +59,14 @@ private static String encode(String v) {
     private byte[] parseResponse(HttpURLConnection httpUrlConnection) throws ResourceException, IOException {
         int responseCode = httpUrlConnection.getResponseCode();
         if (responseCode >= HttpURLConnection.HTTP_BAD_REQUEST) {
-            byte[] responseBody = readBody(httpUrlConnection);
+            byte[] responseBody = readBody(httpUrlConnection.getErrorStream());
             throw new ResourceException(responseCode, httpUrlConnection.getResponseMessage(), new String(responseBody));
         }
-        return readBody(httpUrlConnection);
+        return readBody(httpUrlConnection.getInputStream());
     }
 
-    private byte[] readBody(HttpURLConnection httpURLConnection) throws IOException {
-        try (QuietCloseable<InputStream> inputStream = new QuietCloseable<>(httpURLConnection.getInputStream())) {
+    private byte[] readBody(InputStream httpInputStream) throws IOException {
+        try (QuietCloseable<InputStream> inputStream = new QuietCloseable<>(httpInputStream)) {
             return readChunked(inputStream.get());
         }
     }