#604 null check for subtype to resolve device functionality nullpointer on unsupported devices