diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 8d26643..1c41957 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -112,8 +112,10 @@
                 throw new NullPointerException("alias == null");
             }
             if (!isKeyStoreUnlocked()) {
-                throw new IllegalStateException("keystore locked");
+                throw new IllegalStateException("keystore is "
+                        + mKeyStore.state().toString());
             }
+
             final int callingUid = getCallingUid();
             if (!hasGrantInternal(mDatabaseHelper.getReadableDatabase(), callingUid, alias)) {
                 throw new IllegalStateException("uid " + callingUid