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