Finish Riley's monster commit

3b38d725d7
May the Gods have mercy on my soul.

Shared/Extensions/ALTServerError+Conveniences.swift

@@ -22,12 +22,8 @@ public extension ALTServerError
         case is EncodingError: self = ALTServerError(.invalidResponse, underlyingError: error)
         case let error as NSError:
             var userInfo = error.userInfo
-            if !userInfo.keys.contains(NSUnderlyingErrorKey)
-            {
-                // Assign underlying error (if there isn't already one).
-                userInfo[NSUnderlyingErrorKey] = error
-            }
-            
+            userInfo[NSUnderlyingErrorKey] = error
+
             self = ALTServerError(.underlyingError, userInfo: userInfo)
         }
     }