Error handling enhancement done