Merge pull request #3 from thomaspaulmann/patch-1

Handle error before unwrapping request data
PromiseKit · Oct 15, 2016 · c7ae494 · c7ae494
2 parents 086852f + 55ebb67
commit c7ae494
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Sources/Alamofire+Promise.swift b/Sources/Alamofire+Promise.swift
@@ -18,10 +18,10 @@ extension Alamofire.DataRequest {
     public func response() -> Promise<(URLRequest, HTTPURLResponse, Data)> {
         return Promise { fulfill, reject in
             response(queue: nil) { rsp in
-                if let a = rsp.request, let b = rsp.response, let c = rsp.data {
-                    fulfill(a, b, c)
-                } else if let error = rsp.error {
+                if let error = rsp.error {
                     reject(error)
+                } else if let a = rsp.request, let b = rsp.response, let c = rsp.data {
+                    fulfill(a, b, c)
                 } else {
                     reject(PMKError.invalidCallingConvention)
                 }