Fix error handling bugs from Neo response changes