Add support to handle when no device is attached