Issue: oldProtocol may be nil in some method changes.