Added todo and changed exception name