Fix exception name, cleanup