Fixed performance, exception name fixed