LPS-42038 Keep the code for the single exception too for backwards compatibility