From 3fc43ec8294463f09b66be7884680ed67f6ba980 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Fri, 4 Dec 2015 13:26:56 -0800
Subject: [PATCH] Fix error when fetching containers upon daemon events

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
---
 src/stores/ContainerStore.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js
index 46ddfce8a1..6e6eeee093 100644
--- a/src/stores/ContainerStore.js
+++ b/src/stores/ContainerStore.js
@@ -100,14 +100,20 @@ class ContainerStore {
   }
 
   updated ({container}) {
+    if (!container || !container.Name) {
+      return;
+    }
+
     let containers = this.containers;
     if (containers[container.Name] && containers[container.Name].State.Updating) {
       return;
     }
 
-    container.Logs = containers[container.Name].Logs;
-    containers[container.Name] = container;
+    if (containers[container.Name] && containers[container.Name].Logs) {
+      container.Logs = containers[container.Name].Logs;
+    }
 
+    containers[container.Name] = container;
     this.setState({containers});
   }