Index: build/chrome/cackey-chrome-init.cc
==================================================================
--- build/chrome/cackey-chrome-init.cc
+++ build/chrome/cackey-chrome-init.cc
@@ -60,11 +60,13 @@
 					smartcardManagerAppId = strdup(message->Get("smartcardManagerAppId").AsString().c_str());
 				}
 
 				pcscNaClInit(this, corePointer, smartcardManagerAppId, "CACKey");
 
-				free((void *) smartcardManagerAppId);
+				if (smartcardManagerAppId) {
+					free((void *) smartcardManagerAppId);
+				}
 
 				reply->Set("status", "success");
 			} else if (command.AsString() == "listcertificates") {
 				numCertificates = cackey_chrome_listCertificates(&certificates);