diff --git a/src/KeyValueStore/DatabaseStorageExpirableToken.php b/src/KeyValueStore/DatabaseStorageExpirableToken.php
index 5e44707e1b1a96025d49c9d2c6dd096ae7f3a8e8..680a62d235cdee47f73168e1e62d05bf191fc6a2 100644
--- a/src/KeyValueStore/DatabaseStorageExpirableToken.php
+++ b/src/KeyValueStore/DatabaseStorageExpirableToken.php
@@ -37,7 +37,11 @@ class DatabaseStorageExpirableToken extends DatabaseStorageExpirable {
     $token = preg_replace('/[^a-z0-9_-]/i', '', $token);
     $token = trim($token);
 
-    return empty($token) ? '' : sprintf('%%;s:13:"preview_token";s:%d:"%s";%%', strlen($token), $token);
+    if (empty($token)) {
+      throw new \InvalidArgumentException('Invalid token value.');
+    }
+
+    return sprintf('%%;s:13:"preview_token";s:%d:"%s";%%', strlen($token), $token);
   }
 
   /**
@@ -51,7 +55,6 @@ class DatabaseStorageExpirableToken extends DatabaseStorageExpirable {
    */
   public function getKeyByToken(?string $token) {
     try {
-      // Search for the token.
       $data = $this->connection->query(
         'SELECT [name], [value] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE value LIKE :token AND collection = :collection',
         [