diff --git a/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java b/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
index 68e56cb1fd2b..b998a499bbf0 100644
--- a/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
+++ b/cdap-app-templates/cdap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
@@ -217,7 +217,8 @@ public void putOAuthCredential(HttpServiceRequest request, HttpServiceResponder
       if (!hasAccessToken && !hasRefreshToken) {
         throw new OAuthServiceException(
             HttpURLConnection.HTTP_BAD_REQUEST,
-            "Refresh token response body did not contain a refresh token or access token");
+            String.format("Refresh token response is missing the required access token or refresh token. See the full response body: %s", refreshTokenResponse);
+        );
       }
 
       if (hasRefreshToken) {