Make error handling less absolutely terrible