bare excepts, as is proper

Change-Id: Ifd28f6f14a781a67644315690491888161a7250c
Merge "bare excepts, as is proper"