Updated some exception handling based on a change in the Commons Library.