More in the way of error-checking.