Corrected exceptions being thrown