Fixed response message catching.