             XCTFail("deletePersistentToken(_:) failed with error: \(error)")
         }
 
-        let checkItem1 = try keychain.persistentTokenWithIdentifier(savedItem1.identifier)
-        XCTAssertNil(checkItem1, "Token should not be in keychain: \(token1)")
-        let checkItem2 = try keychain.persistentTokenWithIdentifier(savedItem2.identifier)
-        XCTAssertNotNil(checkItem2, "Token should be in keychain: \(token2)")
+        do {
+            let checkItem1 = try keychain.persistentTokenWithIdentifier(savedItem1.identifier)
+            XCTAssertNil(checkItem1, "Token should not be in keychain: \(token1)")
+            let checkItem2 = try keychain.persistentTokenWithIdentifier(savedItem2.identifier)
+            XCTAssertNotNil(checkItem2, "Token should be in keychain: \(token2)")
+        } catch {
+            XCTFail("Error thrown from keychain: \(error)")
+            return
+        }
 
         // Remove the second token from the keychain
         do {

        } catch {
            // TODO: Assert the expected error type
        }

    } catch {
        XCTFail("Error thrown from keychain: \(error)")
        return
    }
    }

    func itemFromArray(items: [PersistentToken], withPersistentRef persistentRef: NSData) -> PersistentToken? {

            XCTFail("deletePersistentToken(_:) failed with error: \(error)")
        }

        do {
            let recheckItem1 = try keychain.persistentTokenWithIdentifier(savedItem1.identifier)
            XCTAssertNil(recheckItem1, "Token should not be in keychain: \(token1)")
            let recheckItem2 = try keychain.persistentTokenWithIdentifier(savedItem2.identifier)
            XCTAssertNil(recheckItem2, "Token should not be in keychain: \(token2)")
        } catch {
            XCTFail("Error thrown from keychain: \(error)")
            return
        }

        // Try to remove both tokens from the keychain again
        do {
