XLS-548 Added null checks for view client descriptor function(s).