diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index ea7016e..d59e6fe 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -27,6 +27,7 @@
 #include <utils/String16.h>
 
 #include <keystore/IKeystoreService.h>
+#include <keystore/keystore.h> // For error code
 #include <hardware/gatekeeper.h>
 
 namespace android {
@@ -106,8 +107,9 @@
             sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
             sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
             if (service != NULL) {
-                if (service->addAuthToken(*auth_token, *auth_token_length) != NO_ERROR) {
-                    ALOGE("Falure sending auth token to KeyStore");
+                status_t ret = service->addAuthToken(*auth_token, *auth_token_length);
+                if (ret != ResponseCode::NO_ERROR) {
+                    ALOGE("Falure sending auth token to KeyStore: %d", ret);
                 }
             } else {
                 ALOGE("Unable to communicate with KeyStore");
