#472 Corrected throwing exception