2 files changed, 15 insertions, 2 deletions
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index 4df4a39..a52dfff 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -55,2 +55,6 @@ QtFilterWidget::~QtFilterWidget() {
 bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
+    if (!treeView_) {
+        return false;
+    }
+
     if (event->type() == QEvent::KeyPress ||
@@ -121,2 +125,6 @@ void QtFilterWidget::pushAllFilters() {
 void QtFilterWidget::updateRosterFilters() {
+    if (!treeView_) {
+        return;
+    }
+
     if (fuzzyRosterFilter_) {
@@ -143,2 +151,6 @@ void QtFilterWidget::updateRosterFilters() {
 void QtFilterWidget::updateSearchFilter() {
+    if (!treeView_) {
+        return;
+    }
+
     if (fuzzyRosterFilter_) {
diff --git a/Swift/QtUI/Roster/QtFilterWidget.h b/Swift/QtUI/Roster/QtFilterWidget.h
index ea3c325..85f607e 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.h
+++ b/Swift/QtUI/Roster/QtFilterWidget.h
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
@@ -17,2 +17,3 @@
 #include <QBoxLayout>
+#include <QPointer>
 #include <QWidget>
@@ -48,3 +49,3 @@ class QtFilterWidget : public QWidget {
         QtClosableLineEdit* filterLineEdit_;
-        QtTreeWidget* treeView_;
+        QPointer<QtTreeWidget> treeView_;
         UIEventStream* eventStream_;