[blivet:master 1/7] Rearranged some iffy exception checking