diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp
index 38ea9f4e..bcb19dc7 100644
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
@@ -300,8 +300,9 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneN
 
 QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const
 {
-    if (node == root)
+    if (node == nullptr || node == root)
         return QModelIndex();
+
     return createIndex(node->getParent()->indexOf(node), 0, node);
 }
 
diff --git a/cockatrice/src/remotedecklist_treewidget.cpp b/cockatrice/src/remotedecklist_treewidget.cpp
index d2f048f5..3f94c785 100644
--- a/cockatrice/src/remotedecklist_treewidget.cpp
+++ b/cockatrice/src/remotedecklist_treewidget.cpp
@@ -198,7 +198,7 @@ Qt::ItemFlags RemoteDeckList_TreeModel::flags(const QModelIndex &index) const
 
 QModelIndex RemoteDeckList_TreeModel::nodeToIndex(Node *node) const
 {
-    if (node == root)
+    if (node == nullptr || node == root)
         return QModelIndex();
     return createIndex(node->getParent()->indexOf(node), 0, node);
 }