Fix nil issue with marking responses to statement