Error handling has been improved.