diff --git a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.cpp b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.cpp
index f0c4689d..c8105960 100644
--- a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.cpp
+++ b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.cpp
@@ -1,184 +1,185 @@
 /***************************************************************************
  *   Copyright © 2013 Aleix Pol Gonzalez <aleixpol@blue-systems.com>       *
  *   Copyright © 2017 Jan Grulich <jgrulich@redhat.com>                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or         *
  *   modify it under the terms of the GNU General Public License as        *
  *   published by the Free Software Foundation; either version 2 of        *
  *   the License or (at your option) version 3 or any later version        *
  *   accepted by the membership of KDE e.V. (or its successor approved     *
  *   by the membership of KDE e.V.), which shall act as a proxy            *
  *   defined in Section 14 of version 3 of the license.                    *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #include "FlatpakNotifier.h"
 
 #include <glib.h>
 
 #include <QDebug>
 #include <QTimer>
 #include <QtConcurrentRun>
 #include <QFutureWatcher>
 
 static void installationChanged(GFileMonitor *monitor, GFile *child, GFile *other_file, GFileMonitorEvent event_type, gpointer self)
 {
     Q_UNUSED(monitor);
     Q_UNUSED(child);
     Q_UNUSED(other_file);
     Q_UNUSED(event_type);
 
     FlatpakNotifier *notifier = (FlatpakNotifier*)self;
     if (!notifier) {
         return;
     }
 
     notifier->checkUpdates();
 }
 
 FlatpakNotifier::FlatpakNotifier(QObject* parent)
     : BackendNotifierModule(parent)
     , m_userInstallationUpdates(0)
     , m_systemInstallationUpdates(0)
 {
     m_cancellable = g_cancellable_new();
 
     checkUpdates();
 
     QTimer *dailyCheck = new QTimer(this);
     dailyCheck->setInterval(24 * 60 * 60 * 1000); //refresh at least once every day
     connect(dailyCheck, &QTimer::timeout, this, &FlatpakNotifier::checkUpdates);
 }
 
 FlatpakNotifier::~FlatpakNotifier()
 {
     g_object_unref(m_userInstallationMonitor);
     g_object_unref(m_systemInstallationMonitor);
     g_object_unref(m_flatpakInstallationSystem);
     g_object_unref(m_flatpakInstallationUser);
     g_object_unref(m_cancellable);
 }
 
 void FlatpakNotifier::recheckSystemUpdateNeeded()
 {
     checkUpdates();
 }
 
 uint FlatpakNotifier::securityUpdatesCount()
 {
     return 0;
 }
 
 uint FlatpakNotifier::updatesCount()
 {
     return m_systemInstallationUpdates + m_userInstallationUpdates;
 }
 
 void FlatpakNotifier::checkUpdates()
 {
     g_autoptr(GError) error = nullptr;
 
     // Load flatpak installation
     if (!setupFlatpakInstallations(&error)) {
         qWarning() << "Failed to setup flatpak installations: " << error->message;
     } else {
         // Load updates from remote repositories
         loadRemoteUpdates(m_flatpakInstallationSystem);
         loadRemoteUpdates(m_flatpakInstallationUser);
     }
 }
 
 void FlatpakNotifier::onFetchUpdatesFinished(FlatpakInstallation *flatpakInstallation, GPtrArray *updates)
 {
     bool changed = false;
     uint validUpdates = 0;
 
     g_autoptr(GPtrArray) fetchedUpdates = updates;
 
     for (uint i = 0; i < fetchedUpdates->len; i++) {
         FlatpakInstalledRef *ref = FLATPAK_INSTALLED_REF(g_ptr_array_index(fetchedUpdates, i));
         const QString refName = QString::fromUtf8(flatpak_ref_get_name(FLATPAK_REF(ref)));
         // FIXME right now I can't think of any other filter than this, in FlatpakBackend updates are matched
         // with apps so .Locale/.Debug subrefs are not shown and updated automatically. Also this will show
         // updates for refs we don't show in Discover if appstream metadata or desktop file for them is not found
         if (refName.endsWith(QStringLiteral(".Locale")) || refName.endsWith(QStringLiteral(".Debug"))) {
             continue;
         }
         validUpdates++;
     }
 
     if (flatpak_installation_get_is_user(flatpakInstallation)) {
         changed = m_userInstallationUpdates != validUpdates;
         m_userInstallationUpdates = validUpdates;
     } else {
         changed = m_systemInstallationUpdates != validUpdates;
         m_systemInstallationUpdates = validUpdates;
     }
 
     if (changed) {
         Q_EMIT foundUpdates();
     }
 }
 
 void FlatpakNotifier::loadRemoteUpdates(FlatpakInstallation *installation)
 {
     auto fw = new QFutureWatcher<GPtrArray *>(this);
     fw->setFuture(QtConcurrent::run( [installation]() -> GPtrArray * {
         g_autoptr(GCancellable) cancellable = g_cancellable_new();
         g_autoptr(GError) localError = nullptr;
         GPtrArray *refs = flatpak_installation_list_installed_refs_for_update(installation, cancellable, &localError);
         if (!refs) {
             qWarning() << "Failed to get list of installed refs for listing updates: " << localError->message;
         }
         return refs;
     }));
     connect(fw, &QFutureWatcher<GPtrArray *>::finished, this, [this, installation, fw](){
         auto refs = fw->result();
-        onFetchUpdatesFinished(installation, refs);
+        if (refs)
+            onFetchUpdatesFinished(installation, refs);
         fw->deleteLater();
     });
 }
 
 bool FlatpakNotifier::setupFlatpakInstallations(GError **error)
 {
     if (!m_flatpakInstallationSystem) {
         m_flatpakInstallationSystem = flatpak_installation_new_system(m_cancellable, error);
         if (!m_flatpakInstallationSystem) {
             return false;
         }
     }
 
     if (!m_flatpakInstallationUser) {
         m_flatpakInstallationUser = flatpak_installation_new_user(m_cancellable, error);
         if (!m_flatpakInstallationUser) {
             return false;
         }
     }
 
     if (!m_systemInstallationMonitor) {
         m_systemInstallationMonitor = flatpak_installation_create_monitor(m_flatpakInstallationSystem, m_cancellable, error);
         if (!m_systemInstallationMonitor) {
             return false;
         }
 
         g_signal_connect(m_systemInstallationMonitor, "changed", G_CALLBACK(installationChanged), this);
     }
 
     if (!m_userInstallationMonitor) {
         m_userInstallationMonitor = flatpak_installation_create_monitor(m_flatpakInstallationUser, m_cancellable, error);
         if (!m_userInstallationMonitor) {
             return false;
         }
 
         g_signal_connect(m_userInstallationMonitor, "changed", G_CALLBACK(installationChanged), this);
     }
 
     return true;
 }