[PMSH] Improve Failure Handling