Additional Error handling improvements.