Fix exception messages, add TODO for class duplicates