Corrected some exception throwing