Consistently use try/except/else

Change-Id: Ib2c0ea8672ce07dbcfc2b221c44f835ed3b40a17