Fix NPE in SystemCapabilityManager

1 files changed, 7 insertions, 4 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
index 54a343043..e76189632 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
@@ -135,12 +135,15 @@ abstract class BaseSystemCapabilityManager {
 
         // HAX: Issue #1705, Ford Sync bug returning incorrect template name for "NON-MEDIA" (https://github.com/smartdevicelink/sdl_java_suite/issues/1705).
         List<String> templatesAvailable = display.getTemplatesAvailable();
-        for (int i = 0; i < templatesAvailable.size(); i++) {
-            if (templatesAvailable.get(i).equals("NON_MEDIA")) {
-                templatesAvailable.set(i, "NON-MEDIA");
-                break;
+        if (templatesAvailable != null) {
+            for (int i = 0; i < templatesAvailable.size(); i++) {
+                if (templatesAvailable.get(i).equals("NON_MEDIA")) {
+                    templatesAvailable.set(i, "NON-MEDIA");
+                    break;
+                }
             }
         }
+
         // copy all available display capabilities
         defaultWindowCapability.setTemplatesAvailable(templatesAvailable);
         defaultWindowCapability.setNumCustomPresetsAvailable(display.getNumCustomPresetsAvailable());