Added response catching for FSM query