diff --git a/cli/main.cpp b/cli/main.cpp
index bce5f06..9efb979 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -81,7 +81,10 @@ int main(int argc, char *argv[])
                                     configArgs.targetFormatArg.isPresent() ? configArgs.targetFormatArg.values().front() : string("zip"),
                                     configArgs.defaultIconThemeArg.isPresent() ? configArgs.defaultIconThemeArg.values().front() : string());
             } else if(configArgs.upgradeLookupArg.isPresent()) {
-                UpgradeLookupCli upgradeLookup(manager, configArgs.upgradeLookupArg.values().front());
+                UpgradeLookupCli upgradeLookup(manager, configArgs.repoNameArg.values().front());
+                if(upgradeLookup.hasErrors()) {
+                    return 25;
+                }
                 return application.exec();
             }
         } else if(!configArgs.helpArg.isPresent()) {
diff --git a/lib/alpm/upgradelookup.h b/lib/alpm/upgradelookup.h
index 7c1b7d6..72b73d1 100644
--- a/lib/alpm/upgradelookup.h
+++ b/lib/alpm/upgradelookup.h
@@ -180,6 +180,7 @@ class UpgradeLookupCli : public UpgradeLookup
     friend class UpgradeLookupProcess;
 public:
     explicit UpgradeLookupCli(Manager &manager, const std::string &repo, QObject *parent = nullptr);
+    bool hasErrors() const;
     const Repository *toCheck() const;
 
 private slots:
@@ -196,6 +197,11 @@ private:
     QStringList m_orphanedPackagesArray;
 };
 
+inline bool UpgradeLookupCli::hasErrors() const
+{
+    return !m_errorsArray.isEmpty();
+}
+
 
 } // namespace PackageManagement