diff --git a/riemann.go b/riemann.go
index 851e700..fab1199 100644
--- a/riemann.go
+++ b/riemann.go
@@ -120,10 +120,7 @@ func (r *riemann) Connect() error {
 }
 
 func (r *riemann) Close() error {
-	// TODO(ivan): Switch to return r.client.Close() once (and if)
-	// https://github.com/amir/raidman/pull/17 gets merged.
-	r.client.Close()
-	return nil
+	return r.client.Close()
 }
 
 func (r *riemann) SendEvent(e *raidman.Event) error {