Fixed for file organization changes; implementing RiotException