Incorporated review comments to add exception in BootstrapProtocol