diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 873eba1668..676e69cc70 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1289,7 +1289,6 @@ circuit_finish_handshake(origin_circuit_t *circ,
   onion_handshake_state_release(&hop->handshake_state);
 
   if (circuit_init_cpath_crypto(hop, keys, 0)<0) {
-    log_warn(LD_BUG, "Couldn't initialize cpath crypto");
     return -END_CIRC_REASON_TORPROTOCOL;
   }
 
diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index 32d5344520..a7c0545dc7 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -292,15 +292,17 @@ onion_skin_ntor_client_handshake(
 
   memwipe(&s, 0, sizeof(s));
 
-  if (bad && msg_out) {
+  if (bad) {
     if (bad & 4) {
-      *msg_out = NULL; /* Don't report this one; we probably just had the
-                        * wrong onion key.*/
+      if (msg_out)
+        *msg_out = NULL; /* Don't report this one; we probably just had the
+                          * wrong onion key.*/
       log_fn(LOG_INFO, LD_PROTOCOL,
              "Invalid result from curve25519 handshake: %d", bad);
     }
     if (bad & 3) {
-      *msg_out = "Zero output from curve25519 handshake";
+      if (msg_out)
+        *msg_out = "Zero output from curve25519 handshake";
       log_fn(LOG_WARN, LD_PROTOCOL,
              "Invalid result from curve25519 handshake: %d", bad);
     }