Handle error in state properly
Handle error in state properly

Anup-Allamsetty/pure,scrollback/pure,belng/pure,Anup-Allamsetty/pure,scrollback/pure,belng/pure,scrollback/pure,belng/pure,scrollback/pure,belng/pure,Anup-Allamsetty/pure,Anup-Allamsetty/pure