Let's move these error catches up to 377 (i.e., deal with error cases first).