add bare except to catch errors

Change-Id: Ibe78912cf923591bddd6a8cf0e683cd028c9c4e8
bare excepts, as is proper

Change-Id: Ifd28f6f14a781a67644315690491888161a7250c
Merge "add bare except to catch errors"
Merge "bare excepts, as is proper"