diff --git a/dummy/random.go b/dummy/random.go
index a70eb72af368dbf19727a27f439eee2ff68f7a64..4190336b55ed461c4264ad259340876bc676afc7 100644
--- a/dummy/random.go
+++ b/dummy/random.go
@@ -48,7 +48,6 @@ func (m *Manager) newRandomCmixMessage(rng csprng.Source) (
 			errors.Errorf(recipientRngErr, err)
 	}
 
-	// todo: use error constants above?
 	// Generate random message payload
 	payloadSize := m.store.GetCmixGroup().GetP().ByteLen()
 	payload, err = newRandomPayload(payloadSize, rng)
@@ -124,7 +123,7 @@ func newRandomMAC(rng csprng.Source) ([]byte, error) {
 }
 
 //////////////////////////////////////////////////////////////////////////////////
-// Random Duration functions
+// Miscellaneous
 //////////////////////////////////////////////////////////////////////////////////
 
 // randomDuration returns a duration that is the base duration plus or minus a
@@ -141,10 +140,6 @@ func randomDuration(base, randomRange time.Duration, rng csprng.Source) (
 	return base + randomRange - time.Duration(delta), nil
 }
 
-//////////////////////////////////////////////////////////////////////////////////
-// Miscellaneous
-//////////////////////////////////////////////////////////////////////////////////
-
 // randomInt returns, as an int, a non-negative, non-zero random number in [1, n)
 // from the csprng.Source.
 func randomInt(n int, rng csprng.Source) (int, error) {
diff --git a/dummy/send.go b/dummy/send.go
index 8dc698bc1b51a1bfde473b664d94bb25fca1f5d0..06561c941434643f6f77af8105f78323b4d3c47b 100644
--- a/dummy/send.go
+++ b/dummy/send.go
@@ -101,7 +101,8 @@ func (m *Manager) sendMessages() error {
 
 			err = m.sendMessage(localIndex, totalMessages, rng)
 			if err != nil {
-				jww.ERROR.Printf(err.Error())
+				jww.ERROR.Printf("Failed to send message %d/%d: %+v",
+					localIndex, numMessages, err)
 			}
 			// Add to counter of successful sends
 			atomic.AddInt64(&sent, 1)
@@ -119,16 +120,14 @@ func (m *Manager) sendMessage(index, totalMessages int, rng csprng.Source) error
 	// Generate message data
 	recipient, fp, service, payload, mac, err := m.newRandomCmixMessage(rng)
 	if err != nil {
-		return errors.Errorf("Failed to create dummy message %d/%d: %+v",
-			index, totalMessages, err)
+		return errors.Errorf("Failed to create random data: %+v", err)
 	}
 
 	// Send message
 	p := cmix.GetDefaultCMIXParams()
 	_, _, err = m.net.Send(recipient, fp, service, payload, mac, p)
 	if err != nil {
-		return errors.Errorf("Failed to send dummy message %d/%d: %+v",
-			index, totalMessages, err)
+		return errors.Errorf("Failed to send message: %+v", err)
 	}
 
 	return nil