Better exception name

Tests can be done at the end.