             return
         }
         if !self.hasApplicationQueriesScheme() {
-            let message = "DropboxSDK: unable to link; app isn't registered to query for URL scheme dbapi-2. Add a dbapi-2 entry to LSApplicationQueriesSchemes"
+            let message = "DropboxSDK: unable to link; app isn't registered to query for URL schemes dbapi-2 and dbapi-8-emm. Add a dbapi-2 entry and a dbapi-8-emm entry to LSApplicationQueriesSchemes"
             
             let alertController = UIAlertController(
                 title: "SwiftyDropbox Error",

            controller.presentViewController(alertController, animated: true, completion: { fatalError(message) } )
            return
        }
        if UIApplication.sharedApplication().canOpenURL(dAuthURL(nil)) {
            let nonce = NSUUID().UUIDString
            NSUserDefaults.standardUserDefaults().setObject(nonce, forKey: kDBLinkNonce)
            NSUserDefaults.standardUserDefaults().synchronize()
            
            UIApplication.sharedApplication().openURL(dAuthURL(nonce))
        } else {
            let web = DropboxConnectController(
                URL: self.authURL(),

    private func hasApplicationQueriesScheme() -> Bool {
        
        let queriesSchemes = NSBundle.mainBundle().objectForInfoDictionaryKey("LSApplicationQueriesSchemes") as? [String] ?? []

        var countSchemes = 0
        for scheme in queriesSchemes {
            if scheme == "dbapi-2" {
                countSchemes++
            } else if scheme == "dbapi-8-emm" {
                countSchemes++
            }
            if countSchemes >= 2 {
                return true
            }
        }
