Added TODO
Made exceptions slightly prettier