Fixed issue with empty / unknown deviceName node