Better handle graph controls states on errors