fixes for 1396 None values in device object lists.
Merge pull request #1601 from edwardhunter/1396_rebase2

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