SWC-841 Added check for null when updating view from descriptor
Merge pull request #572 from heidiso/develop

SWC-841 Added check for null when updating view from descriptor