Updated some exception handling based on a change in the Commons Library.
Merge branch 'master' into devel