diff --git a/README.md b/README.md
index 56a23e84..68efa4d0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ download links are also provided below.
 
 ### Gradle
 ```groovy
-compile "com.smartcar.sdk:java-sdk:2.6.2"
+compile "com.smartcar.sdk:java-sdk:2.6.3"
 ```
 
 ### Maven
@@ -19,14 +19,14 @@ compile "com.smartcar.sdk:java-sdk:2.6.2"
 <dependency>
   <groupId>com.smartcar.sdk</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>2.6.2</version>
+  <version>2.6.3</version>
 </dependency>
 ```
 
 ### Jar Direct Download
-* [java-sdk-2.6.2.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.2%2Fjava-sdk-2.6.2.jar)
-* [java-sdk-2.6.2-sources.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.2%2Fjava-sdk-2.6.2-sources.jar)
-* [java-sdk-2.6.2-docs.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.2%2Fjava-sdk-2.6.2-docs.jar)
+* [java-sdk-2.6.3.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.3%2Fjava-sdk-2.6.3.jar)
+* [java-sdk-2.6.3-sources.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.3%2Fjava-sdk-2.6.3-sources.jar)
+* [java-sdk-2.6.3-docs.jar](https://bintray.com/smartcar/library/download_file?file_path=com%2Fsmartcar%2Fsdk%2Fjava-sdk%2F2.6.3%2Fjava-sdk-2.6.3-docs.jar)
 
 
 ## Usage
@@ -129,5 +129,5 @@ start making requests to vehicles.
 [ci-url]: https://travis-ci.com/smartcar/java-sdk
 [coverage-image]: https://codecov.io/gh/smartcar/java-sdk/branch/master/graph/badge.svg?token=nZAITx7w3X
 [coverage-url]: https://codecov.io/gh/smartcar/java-sdk
-[javadoc-image]: https://img.shields.io/badge/javadoc-2.6.2-brightgreen.svg
+[javadoc-image]: https://img.shields.io/badge/javadoc-2.6.3-brightgreen.svg
 [javadoc-url]: https://smartcar.github.io/java-sdk
diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html
index 3ad68f08..4753191b 100644
--- a/docs/allclasses-frame.html
+++ b/docs/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (java-sdk - 2.6.2)</title>
+<title>All Classes (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html
index 6f487464..605d4271 100644
--- a/docs/allclasses-noframe.html
+++ b/docs/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (java-sdk - 2.6.2)</title>
+<title>All Classes (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/com/smartcar/sdk/AuthClient.AuthUrlBuilder.html b/docs/com/smartcar/sdk/AuthClient.AuthUrlBuilder.html
index aa0ef044..0ed1c2b2 100644
--- a/docs/com/smartcar/sdk/AuthClient.AuthUrlBuilder.html
+++ b/docs/com/smartcar/sdk/AuthClient.AuthUrlBuilder.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>AuthClient.AuthUrlBuilder (java-sdk - 2.6.2)</title>
+<title>AuthClient.AuthUrlBuilder (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AuthClient.AuthUrlBuilder (java-sdk - 2.6.2)";
+            parent.document.title="AuthClient.AuthUrlBuilder (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.Builder.html b/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.Builder.html
index aff41f65..f4a64d2a 100644
--- a/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.Builder.html
+++ b/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.Builder.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>AuthClient.AuthVehicleInfo.Builder (java-sdk - 2.6.2)</title>
+<title>AuthClient.AuthVehicleInfo.Builder (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AuthClient.AuthVehicleInfo.Builder (java-sdk - 2.6.2)";
+            parent.document.title="AuthClient.AuthVehicleInfo.Builder (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.html b/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.html
index c5210775..1bd806db 100644
--- a/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.html
+++ b/docs/com/smartcar/sdk/AuthClient.AuthVehicleInfo.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>AuthClient.AuthVehicleInfo (java-sdk - 2.6.2)</title>
+<title>AuthClient.AuthVehicleInfo (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AuthClient.AuthVehicleInfo (java-sdk - 2.6.2)";
+            parent.document.title="AuthClient.AuthVehicleInfo (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/AuthClient.html b/docs/com/smartcar/sdk/AuthClient.html
index 0071ea3c..9443b662 100644
--- a/docs/com/smartcar/sdk/AuthClient.html
+++ b/docs/com/smartcar/sdk/AuthClient.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>AuthClient (java-sdk - 2.6.2)</title>
+<title>AuthClient (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AuthClient (java-sdk - 2.6.2)";
+            parent.document.title="AuthClient (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/BatchResponseMissingException.html b/docs/com/smartcar/sdk/BatchResponseMissingException.html
index 1031d299..030ccc2c 100644
--- a/docs/com/smartcar/sdk/BatchResponseMissingException.html
+++ b/docs/com/smartcar/sdk/BatchResponseMissingException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>BatchResponseMissingException (java-sdk - 2.6.2)</title>
+<title>BatchResponseMissingException (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchResponseMissingException (java-sdk - 2.6.2)";
+            parent.document.title="BatchResponseMissingException (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/SmartcarException.html b/docs/com/smartcar/sdk/SmartcarException.html
index e9762ce0..9a45aae8 100644
--- a/docs/com/smartcar/sdk/SmartcarException.html
+++ b/docs/com/smartcar/sdk/SmartcarException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>SmartcarException (java-sdk - 2.6.2)</title>
+<title>SmartcarException (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SmartcarException (java-sdk - 2.6.2)";
+            parent.document.title="SmartcarException (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/Vehicle.UnitSystem.html b/docs/com/smartcar/sdk/Vehicle.UnitSystem.html
index 916c6979..9ced4062 100644
--- a/docs/com/smartcar/sdk/Vehicle.UnitSystem.html
+++ b/docs/com/smartcar/sdk/Vehicle.UnitSystem.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Vehicle.UnitSystem (java-sdk - 2.6.2)</title>
+<title>Vehicle.UnitSystem (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Vehicle.UnitSystem (java-sdk - 2.6.2)";
+            parent.document.title="Vehicle.UnitSystem (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/Vehicle.html b/docs/com/smartcar/sdk/Vehicle.html
index d9f4e4e1..e26ed09e 100644
--- a/docs/com/smartcar/sdk/Vehicle.html
+++ b/docs/com/smartcar/sdk/Vehicle.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Vehicle (java-sdk - 2.6.2)</title>
+<title>Vehicle (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Vehicle (java-sdk - 2.6.2)";
+            parent.document.title="Vehicle (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/ApiData.html b/docs/com/smartcar/sdk/data/ApiData.html
index a7b3cb80..c768d5e4 100644
--- a/docs/com/smartcar/sdk/data/ApiData.html
+++ b/docs/com/smartcar/sdk/data/ApiData.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ApiData (java-sdk - 2.6.2)</title>
+<title>ApiData (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ApiData (java-sdk - 2.6.2)";
+            parent.document.title="ApiData (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/ApplicationPermissions.html b/docs/com/smartcar/sdk/data/ApplicationPermissions.html
index 60fd74d7..5d72e5fa 100644
--- a/docs/com/smartcar/sdk/data/ApplicationPermissions.html
+++ b/docs/com/smartcar/sdk/data/ApplicationPermissions.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ApplicationPermissions (java-sdk - 2.6.2)</title>
+<title>ApplicationPermissions (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ApplicationPermissions (java-sdk - 2.6.2)";
+            parent.document.title="ApplicationPermissions (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/Auth.html b/docs/com/smartcar/sdk/data/Auth.html
index 73739338..828057d0 100644
--- a/docs/com/smartcar/sdk/data/Auth.html
+++ b/docs/com/smartcar/sdk/data/Auth.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Auth (java-sdk - 2.6.2)</title>
+<title>Auth (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Auth (java-sdk - 2.6.2)";
+            parent.document.title="Auth (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/BatchDeserializer.html b/docs/com/smartcar/sdk/data/BatchDeserializer.html
index ab3505df..a6e6c322 100644
--- a/docs/com/smartcar/sdk/data/BatchDeserializer.html
+++ b/docs/com/smartcar/sdk/data/BatchDeserializer.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>BatchDeserializer (java-sdk - 2.6.2)</title>
+<title>BatchDeserializer (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchDeserializer (java-sdk - 2.6.2)";
+            parent.document.title="BatchDeserializer (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/BatchResponse.html b/docs/com/smartcar/sdk/data/BatchResponse.html
index 43c9da25..78647a5c 100644
--- a/docs/com/smartcar/sdk/data/BatchResponse.html
+++ b/docs/com/smartcar/sdk/data/BatchResponse.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>BatchResponse (java-sdk - 2.6.2)</title>
+<title>BatchResponse (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BatchResponse (java-sdk - 2.6.2)";
+            parent.document.title="BatchResponse (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/Compatibility.html b/docs/com/smartcar/sdk/data/Compatibility.html
index 8767e223..c322fab2 100644
--- a/docs/com/smartcar/sdk/data/Compatibility.html
+++ b/docs/com/smartcar/sdk/data/Compatibility.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Compatibility (java-sdk - 2.6.2)</title>
+<title>Compatibility (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Compatibility (java-sdk - 2.6.2)";
+            parent.document.title="Compatibility (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/RequestPaging.html b/docs/com/smartcar/sdk/data/RequestPaging.html
index 2cf627a9..07dcbb8b 100644
--- a/docs/com/smartcar/sdk/data/RequestPaging.html
+++ b/docs/com/smartcar/sdk/data/RequestPaging.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>RequestPaging (java-sdk - 2.6.2)</title>
+<title>RequestPaging (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RequestPaging (java-sdk - 2.6.2)";
+            parent.document.title="RequestPaging (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/ResponsePaging.html b/docs/com/smartcar/sdk/data/ResponsePaging.html
index 23b0ff5a..77dd9e99 100644
--- a/docs/com/smartcar/sdk/data/ResponsePaging.html
+++ b/docs/com/smartcar/sdk/data/ResponsePaging.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ResponsePaging (java-sdk - 2.6.2)</title>
+<title>ResponsePaging (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResponsePaging (java-sdk - 2.6.2)";
+            parent.document.title="ResponsePaging (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/SmartcarResponse.html b/docs/com/smartcar/sdk/data/SmartcarResponse.html
index 579c52fc..d1c594ab 100644
--- a/docs/com/smartcar/sdk/data/SmartcarResponse.html
+++ b/docs/com/smartcar/sdk/data/SmartcarResponse.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>SmartcarResponse (java-sdk - 2.6.2)</title>
+<title>SmartcarResponse (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SmartcarResponse (java-sdk - 2.6.2)";
+            parent.document.title="SmartcarResponse (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleBattery.html b/docs/com/smartcar/sdk/data/VehicleBattery.html
index a3453efd..89d7301a 100644
--- a/docs/com/smartcar/sdk/data/VehicleBattery.html
+++ b/docs/com/smartcar/sdk/data/VehicleBattery.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleBattery (java-sdk - 2.6.2)</title>
+<title>VehicleBattery (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleBattery (java-sdk - 2.6.2)";
+            parent.document.title="VehicleBattery (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleCharge.html b/docs/com/smartcar/sdk/data/VehicleCharge.html
index c074a406..ecf1698d 100644
--- a/docs/com/smartcar/sdk/data/VehicleCharge.html
+++ b/docs/com/smartcar/sdk/data/VehicleCharge.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleCharge (java-sdk - 2.6.2)</title>
+<title>VehicleCharge (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleCharge (java-sdk - 2.6.2)";
+            parent.document.title="VehicleCharge (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleFuel.html b/docs/com/smartcar/sdk/data/VehicleFuel.html
index 870efc83..ec99ad95 100644
--- a/docs/com/smartcar/sdk/data/VehicleFuel.html
+++ b/docs/com/smartcar/sdk/data/VehicleFuel.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleFuel (java-sdk - 2.6.2)</title>
+<title>VehicleFuel (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleFuel (java-sdk - 2.6.2)";
+            parent.document.title="VehicleFuel (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleIds.html b/docs/com/smartcar/sdk/data/VehicleIds.html
index 53526e85..2f398227 100644
--- a/docs/com/smartcar/sdk/data/VehicleIds.html
+++ b/docs/com/smartcar/sdk/data/VehicleIds.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleIds (java-sdk - 2.6.2)</title>
+<title>VehicleIds (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleIds (java-sdk - 2.6.2)";
+            parent.document.title="VehicleIds (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleInfo.html b/docs/com/smartcar/sdk/data/VehicleInfo.html
index 7000c16f..12f0f4ac 100644
--- a/docs/com/smartcar/sdk/data/VehicleInfo.html
+++ b/docs/com/smartcar/sdk/data/VehicleInfo.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleInfo (java-sdk - 2.6.2)</title>
+<title>VehicleInfo (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleInfo (java-sdk - 2.6.2)";
+            parent.document.title="VehicleInfo (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleLocation.html b/docs/com/smartcar/sdk/data/VehicleLocation.html
index 4abe4451..56e52ad8 100644
--- a/docs/com/smartcar/sdk/data/VehicleLocation.html
+++ b/docs/com/smartcar/sdk/data/VehicleLocation.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleLocation (java-sdk - 2.6.2)</title>
+<title>VehicleLocation (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleLocation (java-sdk - 2.6.2)";
+            parent.document.title="VehicleLocation (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleOdometer.html b/docs/com/smartcar/sdk/data/VehicleOdometer.html
index a34e6d22..ba54f0c3 100644
--- a/docs/com/smartcar/sdk/data/VehicleOdometer.html
+++ b/docs/com/smartcar/sdk/data/VehicleOdometer.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleOdometer (java-sdk - 2.6.2)</title>
+<title>VehicleOdometer (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleOdometer (java-sdk - 2.6.2)";
+            parent.document.title="VehicleOdometer (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleOil.html b/docs/com/smartcar/sdk/data/VehicleOil.html
index beedafff..901d7d05 100644
--- a/docs/com/smartcar/sdk/data/VehicleOil.html
+++ b/docs/com/smartcar/sdk/data/VehicleOil.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleOil (java-sdk - 2.6.2)</title>
+<title>VehicleOil (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleOil (java-sdk - 2.6.2)";
+            parent.document.title="VehicleOil (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleTirePressure.html b/docs/com/smartcar/sdk/data/VehicleTirePressure.html
index cf684356..3d3ee546 100644
--- a/docs/com/smartcar/sdk/data/VehicleTirePressure.html
+++ b/docs/com/smartcar/sdk/data/VehicleTirePressure.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleTirePressure (java-sdk - 2.6.2)</title>
+<title>VehicleTirePressure (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleTirePressure (java-sdk - 2.6.2)";
+            parent.document.title="VehicleTirePressure (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/VehicleVin.html b/docs/com/smartcar/sdk/data/VehicleVin.html
index b6ca05a1..c97aa23a 100644
--- a/docs/com/smartcar/sdk/data/VehicleVin.html
+++ b/docs/com/smartcar/sdk/data/VehicleVin.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VehicleVin (java-sdk - 2.6.2)</title>
+<title>VehicleVin (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VehicleVin (java-sdk - 2.6.2)";
+            parent.document.title="VehicleVin (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/package-frame.html b/docs/com/smartcar/sdk/data/package-frame.html
index 44b6bb50..81c3953f 100644
--- a/docs/com/smartcar/sdk/data/package-frame.html
+++ b/docs/com/smartcar/sdk/data/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk.data (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk.data (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/docs/com/smartcar/sdk/data/package-summary.html b/docs/com/smartcar/sdk/data/package-summary.html
index 46ec4f8c..a3408b09 100644
--- a/docs/com/smartcar/sdk/data/package-summary.html
+++ b/docs/com/smartcar/sdk/data/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk.data (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk.data (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.smartcar.sdk.data (java-sdk - 2.6.2)";
+            parent.document.title="com.smartcar.sdk.data (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/data/package-tree.html b/docs/com/smartcar/sdk/data/package-tree.html
index f7819e01..1200c0b0 100644
--- a/docs/com/smartcar/sdk/data/package-tree.html
+++ b/docs/com/smartcar/sdk/data/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk.data Class Hierarchy (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk.data Class Hierarchy (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.smartcar.sdk.data Class Hierarchy (java-sdk - 2.6.2)";
+            parent.document.title="com.smartcar.sdk.data Class Hierarchy (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/package-frame.html b/docs/com/smartcar/sdk/package-frame.html
index 69f98151..aad11871 100644
--- a/docs/com/smartcar/sdk/package-frame.html
+++ b/docs/com/smartcar/sdk/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/docs/com/smartcar/sdk/package-summary.html b/docs/com/smartcar/sdk/package-summary.html
index cbff9c13..7ef38f59 100644
--- a/docs/com/smartcar/sdk/package-summary.html
+++ b/docs/com/smartcar/sdk/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.smartcar.sdk (java-sdk - 2.6.2)";
+            parent.document.title="com.smartcar.sdk (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/com/smartcar/sdk/package-tree.html b/docs/com/smartcar/sdk/package-tree.html
index 958df417..17332c28 100644
--- a/docs/com/smartcar/sdk/package-tree.html
+++ b/docs/com/smartcar/sdk/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.smartcar.sdk Class Hierarchy (java-sdk - 2.6.2)</title>
+<title>com.smartcar.sdk Class Hierarchy (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.smartcar.sdk Class Hierarchy (java-sdk - 2.6.2)";
+            parent.document.title="com.smartcar.sdk Class Hierarchy (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/constant-values.html b/docs/constant-values.html
index 9189484a..419bb88f 100644
--- a/docs/constant-values.html
+++ b/docs/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (java-sdk - 2.6.2)</title>
+<title>Constant Field Values (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (java-sdk - 2.6.2)";
+            parent.document.title="Constant Field Values (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html
index 97e651ad..6db0ecf9 100644
--- a/docs/deprecated-list.html
+++ b/docs/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (java-sdk - 2.6.2)</title>
+<title>Deprecated List (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (java-sdk - 2.6.2)";
+            parent.document.title="Deprecated List (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/help-doc.html b/docs/help-doc.html
index 8fe1e54f..c9822884 100644
--- a/docs/help-doc.html
+++ b/docs/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (java-sdk - 2.6.2)</title>
+<title>API Help (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (java-sdk - 2.6.2)";
+            parent.document.title="API Help (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/index-all.html b/docs/index-all.html
index 11b13968..dafa6144 100644
--- a/docs/index-all.html
+++ b/docs/index-all.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (java-sdk - 2.6.2)</title>
+<title>Index (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (java-sdk - 2.6.2)";
+            parent.document.title="Index (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/index.html b/docs/index.html
index 13d201e6..f15a97a9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>java-sdk - 2.6.2</title>
+<title>java-sdk - 2.6.3</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/docs/overview-frame.html b/docs/overview-frame.html
index 7315c04f..97e9c120 100644
--- a/docs/overview-frame.html
+++ b/docs/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (java-sdk - 2.6.2)</title>
+<title>Overview List (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/overview-summary.html b/docs/overview-summary.html
index 685577f4..e9001c1c 100644
--- a/docs/overview-summary.html
+++ b/docs/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (java-sdk - 2.6.2)</title>
+<title>Overview (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (java-sdk - 2.6.2)";
+            parent.document.title="Overview (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/overview-tree.html b/docs/overview-tree.html
index bed96ae4..0f0887b8 100644
--- a/docs/overview-tree.html
+++ b/docs/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (java-sdk - 2.6.2)</title>
+<title>Class Hierarchy (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (java-sdk - 2.6.2)";
+            parent.document.title="Class Hierarchy (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/docs/serialized-form.html b/docs/serialized-form.html
index d8f8a94c..9c45d55d 100644
--- a/docs/serialized-form.html
+++ b/docs/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (java-sdk - 2.6.2)</title>
+<title>Serialized Form (java-sdk - 2.6.3)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (java-sdk - 2.6.2)";
+            parent.document.title="Serialized Form (java-sdk - 2.6.3)";
         }
     }
     catch(err) {
diff --git a/gradle.properties b/gradle.properties
index 2a433958..3cc4cad7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 libGroup=com.smartcar.sdk
 libName=java-sdk
-libVersion=2.6.2
+libVersion=2.6.3
 libDescription=Smartcar Java SDK
 libUrl=https://github.com/smartcar/java-sdk
 
diff --git a/src/main/java/com/smartcar/sdk/SmartcarException.java b/src/main/java/com/smartcar/sdk/SmartcarException.java
index 996d1312..58ad38ab 100644
--- a/src/main/java/com/smartcar/sdk/SmartcarException.java
+++ b/src/main/java/com/smartcar/sdk/SmartcarException.java
@@ -4,6 +4,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
+import javax.json.Json;
 import java.io.IOException;
 
 /**
@@ -84,7 +85,22 @@ public String getRequestId() {
   }
 
   public static SmartcarException Factory(final Response response) throws IOException {
-    JsonObject body = gson.fromJson(response.body().string(), JsonObject.class);
+    JsonObject body;
+    try {
+      body = gson.fromJson(response.body().string(), JsonObject.class);
+    } catch (com.google.gson.JsonParseException exception) {
+      // In case the body is a string. Ex. gateway timeout where LB sends a non json body
+      String errorBody = Json.createObjectBuilder()
+              .add("message", response.body().string())
+              .build().toString();
+      body = gson.fromJson(errorBody, JsonObject.class);
+    } catch (Exception exception) {
+      // Any other exception converting it to SmartcarException
+      String errorBody = Json.createObjectBuilder()
+              .add("message", exception.getMessage())
+              .build().toString();
+      body = gson.fromJson(errorBody, JsonObject.class);
+    }
 
     int statusCode = response.code();
 
diff --git a/src/test/java/com/smartcar/sdk/SmartcarExceptionTest.java b/src/test/java/com/smartcar/sdk/SmartcarExceptionTest.java
index 353ec95d..e76dafb4 100644
--- a/src/test/java/com/smartcar/sdk/SmartcarExceptionTest.java
+++ b/src/test/java/com/smartcar/sdk/SmartcarExceptionTest.java
@@ -121,4 +121,36 @@ public void testSmartcarExceptionFactoryWithMessage() throws Exception {
 
     Assert.assertEquals(ex.getMessage(), expectedMessage);
   }
+
+  /**
+   * Test SmartcarException.Factory with invalid json body
+   */
+  @Test
+  public void testSmartcarExceptionFactoryWithInvalidJsonBody() throws Exception {
+    String response = "invalid json - string body";
+    Response mockResponse = mock(Response.class);
+    ResponseBody mockResponseBody = mock(ResponseBody.class);
+
+    when(mockResponse.body()).thenReturn(mockResponseBody);
+    when(mockResponseBody.string()).thenReturn(response);
+
+    SmartcarException ex = SmartcarException.Factory(mockResponse);
+
+    Assert.assertEquals(ex.getMessage(), response);
+  }
+
+  /**
+   * Test SmartcarException.Factory raising generic exception
+   */
+  @Test
+  public void testSmartcarExceptionFactoryWithGenericException() throws Exception {
+    String response = "raising generic exception";
+    Response mockResponse = mock(Response.class);
+
+    when(mockResponse.body()).thenThrow(new NullPointerException(response));
+
+    SmartcarException ex = SmartcarException.Factory(mockResponse);
+
+    Assert.assertEquals(ex.getMessage(), response);
+  }
 }
