diff --git a/crypto/crypto.go b/crypto/crypto.go
index effa703d06..d56b9112f7 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -92,7 +92,7 @@ func ToECDSAPub(pub []byte) *ecdsa.PublicKey {
 }
 
 func FromECDSAPub(pub *ecdsa.PublicKey) []byte {
-	if pub == nil {
+	if pub == nil || pub.X == nil || pub.Y == nil {
 		return nil
 	}
 	return elliptic.Marshal(S256(), pub.X, pub.Y)
diff --git a/whisper/whisper.go b/whisper/whisper.go
index 76cfe34a47..8eab0825b6 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -197,7 +197,7 @@ func (self *Whisper) add(envelope *Envelope) error {
 		go self.postEvent(envelope)
 	}
 
-	wlogger.DebugDetailln("added whisper message")
+	wlogger.DebugDetailf("added whisper envelope %x\n", envelope)
 
 	return nil
 }