Fix for Stop on error.