Fix to avoid potential error messages from upgrade routine