diff --git a/web/logs.go b/web/logs.go
index e5f70700..87cb5862 100644
--- a/web/logs.go
+++ b/web/logs.go
@@ -67,8 +67,9 @@ func logEventIterator(reader *bufio.Reader) func() (docker.LogEvent, error) {
 					var data map[string]interface{}
 					if err := json.Unmarshal([]byte(message), &data); err != nil {
 						log.Errorf("json unmarshal error while streaming %v", err.Error())
+					} else {
+						logEvent.Message = data
 					}
-					logEvent.Message = data
 				}
 			}
 		}