diff --git a/lib/config/migrate-validate.js b/lib/config/migrate-validate.js
index d29592e6e8432c3ec7cc002ccb1046ba2950aca5..ec33e6ef5f3949028a1f889037d46525d3697c2e 100644
--- a/lib/config/migrate-validate.js
+++ b/lib/config/migrate-validate.js
@@ -18,10 +18,10 @@ function migrateAndValidate(config, input) {
   const massagedConfig = configMassage.massageConfig(migratedConfig);
   const { warnings, errors } = configValidation.validateConfig(massagedConfig);
   // istanbul ignore if
-  if (warnings.length) {
+  if (warnings && warnings.length) {
     logger.info({ warnings }, 'Found renovate config warnings');
   }
-  if (errors.length) {
+  if (errors && errors.length) {
     logger.info({ errors }, 'Found renovate config errors');
   }
   massagedConfig.errors = (config.errors || []).concat(errors);
diff --git a/lib/workers/repository/init/config.js b/lib/workers/repository/init/config.js
index 59c8e904f2abc82e72b33194979d310fa579fea1..b99c3df5535df42aa6d7b55033ecbd367ba50a89 100644
--- a/lib/workers/repository/init/config.js
+++ b/lib/workers/repository/init/config.js
@@ -77,6 +77,8 @@ async function mergeRenovateConfig(config) {
       .join(', ');
     throw error;
   }
+  delete migratedConfig.errors;
+  delete migratedConfig.warnings;
   logger.debug({ config: migratedConfig }, 'renovate.json migrated config');
   const decryptedConfig = decryptConfig(migratedConfig, config.privateKey);
   const resolvedConfig = await presets.resolveConfigPresets(decryptedConfig);