diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 9c233ea262..550f85d3da 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -106,10 +106,11 @@ export default class CreateComment extends React.Component {
                 let state = {};
 
                 if (err.message === 'Invalid RootId parameter') {
+                    PostStore.removePendingPost(post.channel_id, post.pending_post_id);
+
                     if ($('#post_deleted').length > 0) {
                         $('#post_deleted').modal('show');
                     }
-                    PostStore.removePendingPost(post.pending_post_id);
                 } else {
                     post.state = Constants.POST_FAILED;
                     PostStore.updatePendingPost(post);
diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx
index d284a9d1b1..3f487d20f8 100644
--- a/web/react/components/post_deleted_modal.jsx
+++ b/web/react/components/post_deleted_modal.jsx
@@ -2,13 +2,41 @@
 // See License.txt for license information.
 
 var UserStore = require('../stores/user_store.jsx');
+var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+var Constants = require('../utils/constants.jsx');
+var ActionTypes = Constants.ActionTypes;
 
 export default class PostDeletedModal extends React.Component {
     constructor(props) {
         super(props);
 
+        this.handleClose = this.handleClose.bind(this);
+
         this.state = {};
     }
+    componentDidMount() {
+        $(React.findDOMNode(this.refs.modal)).on('hidden.bs.modal', () => {
+            this.handleClose();
+        });
+    }
+    handleClose() {
+        AppDispatcher.handleServerAction({
+            type: ActionTypes.RECIEVED_SEARCH,
+            results: null
+        });
+
+        AppDispatcher.handleServerAction({
+            type: ActionTypes.RECIEVED_SEARCH_TERM,
+            term: null,
+            do_search: false,
+            is_mention_search: false
+        });
+
+        AppDispatcher.handleServerAction({
+            type: ActionTypes.RECIEVED_POST_SELECTED,
+            results: null
+        });
+    }
     render() {
         var currentUser = UserStore.getCurrentUser();
 
@@ -31,17 +59,17 @@ export default class PostDeletedModal extends React.Component {
                                     data-dismiss='modal'
                                     aria-label='Close'
                                 >
-                                    <span aria-hidden='true'>&times;</span>
+                                    <span aria-hidden='true'>{'×'}</span>
                                 </button>
                                 <h4
                                     className='modal-title'
                                     id='myModalLabel'
                                 >
-                                    Comment could not be posted
+                                    {'Comment could not be posted'}
                                 </h4>
                             </div>
                             <div className='modal-body'>
-                                <p>Someone deleted the message on which you tried to post a comment.</p>
+                                <p>{'Someone deleted the message on which you tried to post a comment.'}</p>
                             </div>
                             <div className='modal-footer'>
                                 <button
@@ -49,7 +77,7 @@ export default class PostDeletedModal extends React.Component {
                                     className='btn btn-primary'
                                     data-dismiss='modal'
                                 >
-                                    Okay
+                                    {'Okay'}
                                 </button>
                             </div>
                         </div>
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx
index 2f23d80d9f..27a7847012 100644
--- a/web/react/components/rhs_thread.jsx
+++ b/web/react/components/rhs_thread.jsx
@@ -23,7 +23,7 @@ export default class RhsThread extends React.Component {
     }
     getStateFromStores() {
         var postList = PostStore.getSelectedPost();
-        if (!postList || postList.order.length < 1) {
+        if (!postList || postList.order.length < 1 || !postList.posts[postList.order[0]]) {
             return {postList: {}};
         }
 
@@ -49,7 +49,10 @@ export default class RhsThread extends React.Component {
         }.bind(this));
     }
     componentDidUpdate() {
-        $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight);
+        if ($('.post-right__scroll')[0]) {
+            $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight);
+        }
+
         $('.post-right__scroll').perfectScrollbar('update');
         this.resize();
     }
@@ -67,7 +70,7 @@ export default class RhsThread extends React.Component {
         // if something was changed in the channel like adding a
         // comment or post then lets refresh the sidebar list
         var currentSelected = PostStore.getSelectedPost();
-        if (!currentSelected || currentSelected.order.length === 0) {
+        if (!currentSelected || currentSelected.order.length === 0 || !currentSelected.posts[currentSelected.order[0]]) {
             return;
         }
 
@@ -103,7 +106,7 @@ export default class RhsThread extends React.Component {
     render() {
         var postList = this.state.postList;
 
-        if (postList == null) {
+        if (postList == null || !postList.order) {
             return (
                 <div></div>
             );