Added circular reference failure catching for state passing.