Fix for error showing unassociated devices.