Tweaks error handling message, and no upate object count