Improve handling for the case where no devices are present