More cleanup of exceptions