Added better errors.