fixed a crash due to a replay check with bad code

network/message/handler.go

@@ -126,17 +126,19 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 		return
 	}
 
-	im := fmt.Sprintf("Received message of type %s from %s in round %d,"+
-		" msgDigest: %s, keyFP: %v", encTy, sender, bundle.Round,
-		msgDigest, msg.GetKeyFP())
-	jww.INFO.Print(im)
-	m.Internal.Events.Report(2, "MessageReception", "MessagePart", im)
+
 
 	// Process the decrypted/unencrypted message partition, to see if
 	// we get a full message
 	xxMsg, ok := m.partitioner.HandlePartition(sender, encTy, msg.GetContents(),
 		relationshipFingerprint)
 
+	im := fmt.Sprintf("Received message of ecr type %s and msg type " +
+		"%d from %s in round %d,msgDigest: %s, keyFP: %v", encTy,
+		xxMsg.MessageType, sender, bundle.Round, msgDigest, msg.GetKeyFP())
+	jww.INFO.Print(im)
+	m.Internal.Events.Report(2, "MessageReception", "MessagePart", im)
+
 	// If the reception completed a message, hear it on the switchboard
 	if ok {
 		//Set the identities

storage/utility/meteredCmixMessageBuffer.go

@@ -56,7 +56,7 @@ func (*meteredCmixMessageHandler) LoadMessage(kv *versioned.KV, key string) (int
 	// Load the versioned object
 	vo, err := kv.Get(key, currentMeteredCmixMessageVersion)
 	if err != nil {
-		return format.Message{}, err
+		return nil, err
 	}
 
 	msg := meteredCmixMessage{}