FORGE-1526: Fixed exception thrown and renamed classes for clarity