Updating usage exception handling