improved preq_fail handling