Added generic error support.