Small changes to Exceptions being thrown