Merge "Throw exception on mismatched system vs vendor"