Fixed typos
Better exceptions