Completed error checking for broker 2