Completed error checking in broker1