Merge "Change "could not find class" to warning"