revert to old error handling logic
2.0.0