cleaning up a TODO, making exception more specific