Couple more updates to the error handling