remove todo and fix exception messages