Wherever we move the retrieval logic, this broad catch may be a bit too aggressive.