More testing
More detail on error handling