1 files changed, 4 insertions, 0 deletions
diff --git a/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java b/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
index cbfeff3..4dde60c 100644
--- a/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
+++ b/same-android/src/main/java/com/orbekk/same/android/ClientInterfaceBridge.java
@@ -121,6 +121,10 @@ public class ClientInterfaceBridge implements ClientInterface {
     public void set(Component component) throws UpdateConflict {
         Message message = Message.obtain(null, SameService.SET_STATE);
         message.obj = component;
+        if (serviceMessenger == null) {
+            logger.warn("Not connected to service. Ignore update: {}", component);
+            return;
+        }
         try {
             serviceMessenger.send(message);
         } catch (RemoteException e) {