fixed the message being passed to garbled being nil

network/message/handler.go

@@ -72,9 +72,9 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 				identity.Source, expectedFP, ecrMsg.GetIdentityFP())
 		}
 		im := fmt.Sprintf("Garbled/RAW Message: keyFP: %v, round: %d"+
-			"msgDigest: %s, not determined to be for client", msg.GetKeyFP(), bundle.Round, msg.Digest())
+			"msgDigest: %s, not determined to be for client", ecrMsg.GetKeyFP(), bundle.Round, ecrMsg.Digest())
 		m.Internal.Events.Report(1, "MessageReception", "Garbled", im)
-		m.Session.GetGarbledMessages().Add(msg)
+		m.Session.GetGarbledMessages().Add(ecrMsg)
 		return
 	}
 

storage/utility/meteredCmixMessageBuffer.go

@@ -114,6 +114,10 @@ func LoadMeteredCmixMessageBuffer(kv *versioned.KV, key string) (*MeteredCmixMes
 }
 
 func (mcmb *MeteredCmixMessageBuffer) Add(m format.Message) {
+	if m.GetPrimeByteLen()==0{
+		jww.FATAL.Panicf("Cannot handle a metered " +
+			"cmix message with a length of 0")
+	}
 	msg := meteredCmixMessage{
 		M:         m.Marshal(),
 		Count:     0,