Shuffle some exception handling around.