[BZ 1080552] Adjust the code for the API changes and add exceptions where necessary. The old method is now deprecated but fully implements a call to the revised version.