Changed error message handline