Error messaging changes.