diff --git a/debug-tools/create-cert.cc b/debug-tools/create-cert.cpp
similarity index 93%
rename from debug-tools/create-cert.cc
rename to debug-tools/create-cert.cpp
index 5941783..09399b1 100644
--- a/debug-tools/create-cert.cc
+++ b/debug-tools/create-cert.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /**
- * Copyright (C) 2013 Regents of the University of California.
+ * Copyright (C) 2020 Regents of the University of California.
  * @author: Yingdi Yu <yingdi@cs.ucla.edu>
  * See COPYING for copyright and distribution information.
  */
@@ -19,7 +19,7 @@
 generateCertificate(KeyChain& keyChain, Name name) {
   try {
     keyChain.getPib().getIdentity(name);
-  } catch (ndn::security::pib::Pib::Error&) {
+  } catch (const ndn::security::pib::Pib::Error&) {
     Identity id = keyChain.createIdentity(name);
     Key key = id.getDefaultKey();
     Certificate cert = Certificate(key.getDefaultCertificate());
