Fix overly-aggressive except statements