Checking wrapper existence, Fix #6