diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index 326d63cf1..a1a990490 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -25,9 +25,7 @@ export default class CommentList extends React.Component {
     loading: PropTypes.bool,
 
     // list of actions (flags, etc) associated with the comments
-    actions: PropTypes.shape({
-      ids: PropTypes.arrayOf(PropTypes.string)
-    }),
+    actions: PropTypes.arrayOf(PropTypes.string),
     suspectWords: PropTypes.arrayOf(PropTypes.string)
   }
 
diff --git a/client/coral-ui/components/Dialog.js b/client/coral-ui/components/Dialog.js
index 9af9be6dd..17cb78d28 100644
--- a/client/coral-ui/components/Dialog.js
+++ b/client/coral-ui/components/Dialog.js
@@ -42,7 +42,9 @@ export default class Dialog extends Component {
 
   componentWillUnmount() {
     const dialog = this.dialog;
-    dialog.removeEventListener('cancel', this.props.onCancel);
+    if (dialog) {
+      dialog.removeEventListener('cancel', this.props.onCancel);      
+    }
   }
 
   render() {