Sort out some exception issues.