From 14fd5e44511754938e41f63cbad0894217fcd316 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 17 Jan 2017 15:12:19 -0700
Subject: [PATCH] does a null check

---
 client/coral-framework/actions/user.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js
index f0e6f7fba..021c48eeb 100644
--- a/client/coral-framework/actions/user.js
+++ b/client/coral-framework/actions/user.js
@@ -37,10 +37,15 @@ export const fetchCommentsByUserId = userId => {
         const state = getState();
         comments.forEach(comment => dispatch(addItem(comment, 'comments')));
         assets.forEach(asset => {
+          const prevAsset = state.items.getIn(['assets', asset.id]);
 
-          // Include data such as hydrated comments from assets already in the system.
-          const prevAsset = state.items.getIn(['assets', asset.id]).toJS();
-          dispatch(addItem({...prevAsset, ...asset}, 'assets'));
+          if (prevAsset) {
+
+            // Include data such as hydrated comments from assets already in the system.
+            dispatch(addItem({...prevAsset.toJS(), ...asset}, 'assets'));
+          } else {
+            dispatch(addItem(asset, 'assets'));
+          }
         });
 
         dispatch({type: actions.COMMENTS_BY_USER_SUCCESS, comments: comments.map(comment => comment.id)});