1 files changed, 11 insertions, 7 deletions

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index c954229ae..885efab7a 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -122,16 +122,20 @@ module.exports = React.createClass({
         this.setState({uploadsInProgress: draft['uploadsInProgress'], previews: draft['previews']});
     },
     handleUploadError: function(err, clientId) {
-        var draft = PostStore.getCommentDraft(this.props.rootId);
+        if (clientId !== -1) {
+            var draft = PostStore.getCommentDraft(this.props.rootId);
 
-        var index = draft['uploadsInProgress'].indexOf(clientId);
-        if (index !== -1) {
-            draft['uploadsInProgress'].splice(index, 1);
-        }
+            var index = draft['uploadsInProgress'].indexOf(clientId);
+            if (index !== -1) {
+                draft['uploadsInProgress'].splice(index, 1);
+            }
 
-        PostStore.storeCommentDraft(this.props.rootId, draft);
+            PostStore.storeCommentDraft(this.props.rootId, draft);
 
-        this.setState({uploadsInProgress: draft['uploadsInProgress'], serverError: err});
+            this.setState({uploadsInProgress: draft['uploadsInProgress'], serverError: err});
+        } else {
+            this.setState({serverError: err});
+        }
     },
     clearPreviews: function() {
         this.setState({previews: []});