switching to stricter discipline about exceptions