diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 84535d6f36..5d583be564 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1103,6 +1103,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12448. TestTextCommand: use mkdirs rather than mkdir to create test
     directory. (Contributed by Colin Patrick McCabe and Chris Nauroth)
 
+    HADOOP-10296. Incorrect null check in SwiftRestClient#buildException().
+    (Rahul Palamuttam and Kanaka Kumar Avvaru via aajisaka)
+
   OPTIMIZATIONS
 
     HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
diff --git a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
index a2f5a2ac1a..b8654cee80 100644
--- a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
+++ b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
@@ -172,8 +172,6 @@ public final class SwiftRestClient {
    */
   private URI objectLocationURI;
 
-  private final URI filesystemURI;
-
   /**
    * The name of the service provider
    */
@@ -237,13 +235,6 @@ private synchronized URI getEndpointURI() {
     return endpointURI;
   }
 
-  /**
-   * object location endpoint
-   */
-  private synchronized URI getObjectLocationURI() {
-    return objectLocationURI;
-  }
-
   /**
    * token for Swift communication
    */
@@ -331,13 +322,6 @@ protected final GetMethod doCreateMethod(String uri) {
     }
   }
 
-  private static abstract class PostMethodProcessor<R> extends HttpMethodProcessor<PostMethod, R> {
-    @Override
-    protected final PostMethod doCreateMethod(String uri) {
-      return new PostMethod(uri);
-    }
-  }
-
   /**
    * There's a special type for auth messages, so that low-level
    * message handlers can react to auth failures differently from everything
@@ -449,7 +433,6 @@ protected final HeadMethod doCreateMethod(String uri) {
   private SwiftRestClient(URI filesystemURI,
                           Configuration conf)
       throws SwiftConfigurationException {
-    this.filesystemURI = filesystemURI;
     Properties props = RestClientBindings.bind(filesystemURI, conf);
     String stringAuthUri = getOption(props, SWIFT_AUTH_PROPERTY);
     username = getOption(props, SWIFT_USERNAME_PROPERTY);
@@ -1129,7 +1112,6 @@ public AccessToken extractResult(AuthPostMethod method) throws IOException {
       final List<Catalog> serviceCatalog = access.getServiceCatalog();
       //locate the specific service catalog that defines Swift; variations
       //in the name of this add complexity to the search
-      boolean catalogMatch = false;
       StringBuilder catList = new StringBuilder();
       StringBuilder regionList = new StringBuilder();
 
@@ -1470,7 +1452,7 @@ private <M extends HttpMethod> IOException buildException(URI uri,
         //and the result
         Header availableContentRange = method.getResponseHeader(
           HEADER_CONTENT_RANGE);
-        if (requestContentLen!=null) {
+        if (availableContentRange != null) {
           errorText.append(" available ").append(availableContentRange.getValue());
         }
         fault = new EOFException(errorText.toString());