Tackle exception type TODOs