Improve operation when no device is available