Added exceptions to the TODO