Fix BaseException.message DeprecationWarning

Fix a ex.message reference, which won't work in python3 and
causes a DeprecationWarning to be output on >= python 2.6

Change-Id: Ie115f37997b6bd877e2a5c1d58adf5e3137ac6ae
Merge "Fix BaseException.message DeprecationWarning"