Fix some potential NPEs when session is nullbugfix/issue_1781

1 files changed, 6 insertions, 2 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index 6602e7085..eb780f72d 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -151,7 +151,9 @@ abstract class BaseLifecycleManager {
 
     public void start() {
         try {
-            session.startSession();
+            if (session != null) {
+                session.startSession();
+            }
         } catch (SdlException e) {
             DebugTool.logError(TAG,"Error attempting to start session", e);
         }
@@ -868,7 +870,9 @@ abstract class BaseLifecycleManager {
                 pm.setPriorityCoefficient(1);
             }
 
-            session.sendMessage(pm);
+            if (session != null) {
+                session.sendMessage(pm);
+            }
 
         } catch (OutOfMemoryError e) {
             DebugTool.logError(TAG,"Error attempting to send RPC message.", e);