Added better errors