Add better exception messages to TODO list