LPS-41528 Fail gracefully