fixes for 1396 None values in device object lists. OOIION-1396.

@jamie-cyber1