Do not reference e.message
Fix test broken by error cleanup
Handle changes in uuid module from Python 2 -> 3