diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index 2fad5212d..7c41daa3b 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -133,6 +133,10 @@ ExactCard CardDatabaseQuerier::getCard(const CardRef &cardRef) const
 ExactCard CardDatabaseQuerier::guessCard(const CardRef &cardRef) const
 {
     auto card = lookupCardByName(cardRef.name);
+    if (!card) {
+        return {};
+    }
+
     auto printing =
         cardRef.providerId.isEmpty() ? getPreferredPrinting(card) : findPrintingWithId(card, cardRef.providerId);
 
@@ -173,10 +177,14 @@ ExactCard CardDatabaseQuerier::getCardFromSameSet(const QString &cardName, const
  *
  * @param cardInfo The CardInfo to search
  * @param providerId The uuid to look for
- * @return The PrintingInfo, or a default-constructed PrintingInfo if not found.
+ * @return The PrintingInfo, or a default-constructed PrintingInfo if not found or if cardInfo is null.
  */
 PrintingInfo CardDatabaseQuerier::findPrintingWithId(const CardInfoPtr &cardInfo, const QString &providerId) const
 {
+    if (!cardInfo) {
+        return PrintingInfo();
+    }
+
     for (const auto &printings : cardInfo->getSets()) {
         for (const auto &printing : printings) {
             if (printing.getUuid() == providerId) {
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index 1b48d934b..2b216d5b6 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,6 +1,7 @@
 #include "libcockatrice/card/database/card_database.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 #include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 #include "libcockatrice/card/set/card_set.h"
 #include "libcockatrice/card/set/card_set_list.h"
 #include "test_card_database_path_provider.h"
@@ -29,6 +30,7 @@
 #include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <libcockatrice/utility/card_ref.h>
 #include <string>
 
 namespace
@@ -60,6 +62,31 @@ TEST(CardDatabaseTest, LoadXml)
     ASSERT_EQ(NotLoaded, db->getLoadStatus()) << "Incorrect status after clear";
 }
 
+TEST(CardDatabaseTest, GuessCardWithProviderIdOnUnknownCardReturnsEmpty)
+{
+    // An unknown name plus a providerId used to dereference the missing card
+    // inside findPrintingWithId(); the lookup must come back empty instead.
+    NoopCardPreferenceProvider prefs;
+    TestCardDatabasePathProvider pathProvider;
+    NoopCardSetPriorityController controller;
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    const ExactCard guessed = db.query()->guessCard({"Not a Card", "card_Not a Card_fixture"});
+
+    EXPECT_TRUE(guessed.isEmpty());
+    EXPECT_FALSE(guessed);
+}
+
+TEST(CardDatabaseTest, FindPrintingWithIdOnNullCardInfoReturnsEmpty)
+{
+    NoopCardPreferenceProvider prefs;
+    TestCardDatabasePathProvider pathProvider;
+    NoopCardSetPriorityController controller;
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    EXPECT_TRUE(db.query()->findPrintingWithId(nullptr, "card_Not a Card_fixture").isEmpty());
+}
+
 TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip)
 {
     NoopCardSetPriorityController controller;