diff --git a/Podfile b/Podfile
index 346f13a7..701adb19 100644
--- a/Podfile
+++ b/Podfile
@@ -13,7 +13,7 @@ def pods
     pod 'Kingfisher'
     pod 'TPKeyboardAvoiding', '~> 1.2'
     pod 'pop'
-    pod 'AFNetworking'
+    pod 'AFNetworking', '~> 2.5.4'
     pod 'MZFayeClient', :path => '../CatchLib-iOS/MZFayeClient/'
     pod 'RealmSwift', 0.94
 end
diff --git a/Podfile.lock b/Podfile.lock
index caa734e7..40209394 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,24 +1,24 @@
 PODS:
-  - 1PasswordExtension (1.5)
-  - AFNetworking (2.6.0):
-    - AFNetworking/NSURLConnection (= 2.6.0)
-    - AFNetworking/NSURLSession (= 2.6.0)
-    - AFNetworking/Reachability (= 2.6.0)
-    - AFNetworking/Security (= 2.6.0)
-    - AFNetworking/Serialization (= 2.6.0)
-    - AFNetworking/UIKit (= 2.6.0)
-  - AFNetworking/NSURLConnection (2.6.0):
+  - 1PasswordExtension (1.2)
+  - AFNetworking (2.5.4):
+    - AFNetworking/NSURLConnection (= 2.5.4)
+    - AFNetworking/NSURLSession (= 2.5.4)
+    - AFNetworking/Reachability (= 2.5.4)
+    - AFNetworking/Security (= 2.5.4)
+    - AFNetworking/Serialization (= 2.5.4)
+    - AFNetworking/UIKit (= 2.5.4)
+  - AFNetworking/NSURLConnection (2.5.4):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.6.0):
+  - AFNetworking/NSURLSession (2.5.4):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.6.0)
-  - AFNetworking/Security (2.6.0)
-  - AFNetworking/Serialization (2.6.0)
-  - AFNetworking/UIKit (2.6.0):
+  - AFNetworking/Reachability (2.5.4)
+  - AFNetworking/Security (2.5.4)
+  - AFNetworking/Serialization (2.5.4)
+  - AFNetworking/UIKit (2.5.4):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
   - APAddressBook/Core (0.1.11)
@@ -45,7 +45,7 @@ PODS:
 
 DEPENDENCIES:
   - 1PasswordExtension
-  - AFNetworking
+  - AFNetworking (~> 2.5.4)
   - APAddressBook/Swift
   - DeviceGuru
   - FXBlurView
@@ -60,11 +60,16 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MZFayeClient:
-    :path: ../CatchLib-iOS/MZFayeClient/
+    :path: "../CatchLib-iOS/MZFayeClient/"
 
 SPEC CHECKSUMS:
+<<<<<<< HEAD
   1PasswordExtension: d2392e44526be30ae7d23f305e96e411ede9b9d1
   AFNetworking: 79f7eb1a0fcfa7beb409332b2ca49afe9ce53b05
+=======
+  1PasswordExtension: fcf300204bda5b5c78936dbb937a7d661f1ca796
+  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
+>>>>>>> f4d305b8155792152529b84d8c46772080a0985d
   APAddressBook: 2c949367b190a993d2cce769a3b20bce8bcf000c
   Base64: 4924bf3ca6fa559a5161ef717291bd450eb7bd1a
   DeviceGuru: 34cf5b30fd99e7e3a4cee4c77c03bc94a4362be4
diff --git a/Yep/Info.plist b/Yep/Info.plist
index 0d870d3b..32efff36 100644
--- a/Yep/Info.plist
+++ b/Yep/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>69</string>
+	<string>70</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Yep/Services/YepStorageService.swift b/Yep/Services/YepStorageService.swift
index cdcfc86d..c8f2243a 100644
--- a/Yep/Services/YepStorageService.swift
+++ b/Yep/Services/YepStorageService.swift
@@ -68,8 +68,8 @@ private func uploadFileToS3(inFilePath filePath: String?, orFileData fileData: N
     var progress: NSProgress?
     
     let uploadTask = manager.uploadTaskWithStreamedRequest(request, progress: &progress, completionHandler: { (response, responseObject, error) in
-
-        if let error = error as? NSError {
+        
+        if error != nil {
             println("Error \(error.description) \(response) \(responseObject)")
             if let data = responseObject as? NSData {
                 let string = NSString(data: data, encoding: NSUTF8StringEncoding)