Fix handling of null classRef