diff --git a/src/cli/Show.cpp b/src/cli/Show.cpp
index c4a3b1acd..b596e521b 100644
--- a/src/cli/Show.cpp
+++ b/src/cli/Show.cpp
@@ -78,6 +78,11 @@ int Show::execute(int argc, char **argv)
 
     Uuid uuid = Uuid::fromHex(args.at(1));
     Entry* entry = db->resolveEntry(uuid);
+    if (entry == nullptr) {
+        qCritical("No entry found with uuid %s", qPrintable(uuid.toHex()));
+        return EXIT_FAILURE;
+    }
+
     out << entry->password() << "\n";
     return EXIT_SUCCESS;
 }