Fix a resulting compile error due to exceptions changing. Change-Id: I3119eb73e07b5ee489af907c3c6202b900ab5c09