I think we should stick to the initial error until its resolved instead of dropping and creating a new one...