diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TokenDB.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TokenDB.java
index 83f1afe246a..4e7666d6876 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/TokenDB.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TokenDB.java
@@ -828,8 +828,9 @@ private void checkShouldRevoke(TokenRecord tokenRecord, TPSCertRecord cert, Stri
             if (!isLastActiveSharedCert(cert.getSerialNumber(), cert.getIssuedBy(), tokenRecord.getId())) {
                 msg = "revocation not permitted as certificate " + cert.getSerialNumber() +
                         " is shared by another active token";
-                logger.error(method + " holdRevocation true; " + msg);
-                throw new TPSException(msg);
+                logger.error(method + " holdRevocationUntilLastCredential true; " + msg);
+                throw new TPSException(msg,
+                    TPSStatus.STATUS_NO_ERROR);
             }
         }
         logger.debug(method + "revocation allowed.");