diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc
index 5e0e025..07d1ff1 100644
Binary files a/CredWrite/CredWrite.rc and b/CredWrite/CredWrite.rc differ
diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index a580998..84dc3ec 100644
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@@ -81,12 +81,25 @@ static int CredWrite()
     }
 
     // Write credentials.
-    EAP_ERROR *pEapError;
+    EAP_ERROR *pEapError = NULL;
     DWORD dwResult;
+#ifdef _DEBUG
+    {
+        eap::credentials_pap cred_stored(g_module);
+        dwResult = cred_stored.retrieve(target_name.c_str(), &pEapError);
+        if (pEapError) {
+            OutputDebugStr(_T("%ls (error %u)\n"), pEapError->pRootCauseString, pEapError->dwWinError);
+            g_module.free_error_memory(pEapError);
+            pEapError = NULL;
+        } else
+            OutputDebugStr(_T("Reading credentials failed (error %u).\n"), dwResult);
+    }
+#endif
     if ((dwResult = cred.store(target_name.c_str(), &pEapError)) != ERROR_SUCCESS) {
         if (pEapError) {
             OutputDebugStr(_T("%ls (error %u)\n"), pEapError->pRootCauseString, pEapError->dwWinError);
             g_module.free_error_memory(pEapError);
+            pEapError = NULL;
         } else
             OutputDebugStr(_T("Writing credentials failed (error %u).\n"), dwResult);