More robust yard handler for transitions