Merge "Add more info to class initialization check"