LPS-48313 Make it completely fail safe