Merge "Prevent verify-config from IndexError"