diff --git a/examples/ping-ring/main.go b/examples/ping-ring/main.go
index <HASH>..<HASH> 100644
--- a/examples/ping-ring/main.go
+++ b/examples/ping-ring/main.go
@@ -75,7 +75,11 @@ func (w *worker) PingHandler(ctx json.Context, ping *Ping) (*Pong, error) {
 
 	handle, err := w.ringpop.HandleOrForward(ping.Key, ping.Bytes(), &res, "ping", "/ping", tchannel.JSON, nil)
 	if handle {
-		return &Pong{"Hello, world!", w.ringpop.WhoAmI()}, nil
+		identity, err := w.ringpop.WhoAmI()
+		if err != nil {
+			return nil, err
+		}
+		return &Pong{"Hello, world!", identity}, nil
 	}
 
 	if err := json2.Unmarshal(res, &pong); err != nil {
Fix bug in pong example

WhoAmI() now returns an error if the Ringpop instance is not ready.
Change the handler to check for errors.