Merge pull request #390 from smartdevicelink/bugfix/scm-passing-null

Perform null checks for setting image and text fields

Author: crokita

lib/js/src/manager/SystemCapabilityManager.js

@@ -726,8 +726,12 @@ class SystemCapabilityManager extends _SubManagerBase {
         const convertedCapabilities = new DisplayCapabilities();
         convertedCapabilities.setDisplayType(DisplayType.SDL_GENERIC); // deprecated but it is mandatory...
         convertedCapabilities.setDisplayName(displayName);
-        convertedCapabilities.setTextFields(defaultMainWindow.getTextFields());
-        convertedCapabilities.setImageFields(defaultMainWindow.getImageFields());
+        if (defaultMainWindow.getTextFields() !== null && defaultMainWindow.getTextFields() !== undefined) {
+            convertedCapabilities.setTextFields(defaultMainWindow.getTextFields());
+        }
+        if (defaultMainWindow.getImageFields() !== null && defaultMainWindow.getImageFields() !== undefined) {
+            convertedCapabilities.setImageFields(defaultMainWindow.getImageFields());
+        }
         convertedCapabilities.setTemplatesAvailable(defaultMainWindow.getTemplatesAvailable());
         convertedCapabilities.setNumCustomPresetsAvailable(defaultMainWindow.getNumCustomPresetsAvailable());
         convertedCapabilities.setMediaClockFormats([]); // mandatory field but allows empty array