diff --git a/flaim/src/f_nici.cpp b/flaim/src/f_nici.cpp
index c3924be..6d8076b 100644
--- a/flaim/src/f_nici.cpp
+++ b/flaim/src/f_nici.cpp
@@ -1539,7 +1539,15 @@ RCODE F_CCS::setKeyFromStore(
 			if( RC_BAD( rc = B64Decoder.read(
 				(void *)pucKeyBuf, ui32BufLen, &uiLength)))
 			{
-				goto Exit;
+				if( rc != FERR_EOF_HIT)
+				{
+					goto Exit;
+				}
+
+				// F_Base64DecoderIStream signals end-of-stream with EOF after
+				// returning the decoded bytes.  In this path EOF is a successful
+				// completion, not a failed key decode.
+				rc = FERR_OK;
 			}
 			pucTmp = pucKeyBuf;
 		}