restoring handling for the no error, no response case