diff --git a/client/driver/docker.go b/client/driver/docker.go
index 074fbe5e7..0f0dc9417 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -645,7 +645,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
 		waitCh:           make(chan *cstructs.WaitResult, 1),
 	}
 	if err := exec.RegisterServices(); err != nil {
-		d.logger.Printf("[ERR] driver.docker: error registering services with consul for task: %v, err: %v", task.Name, err)
+		d.logger.Printf("[ERR] driver.docker: error registering services with consul for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil
diff --git a/client/driver/exec.go b/client/driver/exec.go
index bf81fcbe2..b73af6fe5 100644
--- a/client/driver/exec.go
+++ b/client/driver/exec.go
@@ -142,7 +142,7 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 		waitCh:          make(chan *cstructs.WaitResult, 1),
 	}
 	if err := exec.RegisterServices(); err != nil {
-		d.logger.Printf("[ERR] driver.exec: error registering services with consul for task: %v, err: %v", task.Name, err)
+		d.logger.Printf("[ERR] driver.exec: error registering services with consul for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil
diff --git a/client/driver/java.go b/client/driver/java.go
index fab28e934..6e1d70020 100644
--- a/client/driver/java.go
+++ b/client/driver/java.go
@@ -201,7 +201,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 		waitCh:          make(chan *cstructs.WaitResult, 1),
 	}
 	if err := h.executor.RegisterServices(); err != nil {
-		d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %v, err: %v", task.Name, err)
+		d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil
diff --git a/client/driver/qemu.go b/client/driver/qemu.go
index af5f1ac3f..8071e2c9f 100644
--- a/client/driver/qemu.go
+++ b/client/driver/qemu.go
@@ -224,7 +224,7 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 	}
 
 	if err := h.executor.RegisterServices(); err != nil {
-		h.logger.Printf("[ERR] driver.qemu: error registering services for task: %v, err: %v", task.Name, err)
+		h.logger.Printf("[ERR] driver.qemu: error registering services for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil
diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go
index 97ea29257..b909fd083 100644
--- a/client/driver/raw_exec.go
+++ b/client/driver/raw_exec.go
@@ -134,7 +134,7 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
 		waitCh:         make(chan *cstructs.WaitResult, 1),
 	}
 	if err := h.executor.RegisterServices(); err != nil {
-		h.logger.Printf("[ERR] driver.raw_exec: error registering services with consul for task: %v, err: %v", task.Name, err)
+		h.logger.Printf("[ERR] driver.raw_exec: error registering services with consul for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil
diff --git a/client/driver/rkt.go b/client/driver/rkt.go
index 7927df378..9ded52f57 100644
--- a/client/driver/rkt.go
+++ b/client/driver/rkt.go
@@ -269,7 +269,7 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
 		waitCh:         make(chan *cstructs.WaitResult, 1),
 	}
 	if h.executor.RegisterServices(); err != nil {
-		h.logger.Printf("[ERR] driver.rkt: error registering services for task: %v, err: %v", task.Name, err)
+		h.logger.Printf("[ERR] driver.rkt: error registering services for task: %q: %v", task.Name, err)
 	}
 	go h.run()
 	return h, nil