Added error checking & throwing :P

yup, "error throwing"