And more of the error checking