Fix oo accept broker

Fix some bugs, add some checks.