improve error handling on test