diff --git a/zun/common/exception.py b/zun/common/exception.py
index 6313a35bb..ce3e8b178 100644
--- a/zun/common/exception.py
+++ b/zun/common/exception.py
@@ -436,7 +436,7 @@ class ContainerAlreadyExists(ResourceExists):
 
 
 class ExecInstanceAlreadyExists(ResourceExists):
-    message = _("An exec instance with exec_id %(exec_id)s already exists"
+    message = _("An exec instance with exec_id %(exec_id)s already exists "
                 "in container.")
 
 
diff --git a/zun/compute/manager.py b/zun/compute/manager.py
index 105f99234..d1573cc14 100644
--- a/zun/compute/manager.py
+++ b/zun/compute/manager.py
@@ -192,7 +192,7 @@ class Manager(periodic_task.PeriodicTasks):
                     self.driver.delete_volume(context, volmap)
                 except Exception:
                     LOG.exception("Failed to delete volume")
-        msg = _("Volumes did not reach available status after"
+        msg = _("Volumes did not reach available status after "
                 "%d seconds") % (timeout)
         self._fail_container(context, container, msg, unset_host=True)
         raise exception.Conflict(msg)
diff --git a/zun/conf/compute.py b/zun/conf/compute.py
index 350d12156..97ddf1aa4 100644
--- a/zun/conf/compute.py
+++ b/zun/conf/compute.py
@@ -19,7 +19,7 @@ compute_opts = [
     cfg.BoolOpt(
         'resume_container_state',
         default=True,
-        help='restart the containers which are running'
+        help='restart the containers which are running '
              'before the host reboots.'),
     cfg.FloatOpt(
         'reserve_disk_for_image',
diff --git a/zun/container/docker/driver.py b/zun/container/docker/driver.py
index a6779a0ef..ed3f9ed22 100644
--- a/zun/container/docker/driver.py
+++ b/zun/container/docker/driver.py
@@ -170,7 +170,7 @@ class DockerDriver(driver.ContainerDriver):
         try:
             image_driver.delete_committed_image(context, img_id)
         except Exception as e:
-            LOG.exception('Unknown exception occurred while'
+            LOG.exception('Unknown exception occurred while '
                           'deleting image %s: %s',
                           img_id,
                           six.text_type(e))
@@ -1210,8 +1210,8 @@ class DockerDriver(driver.ContainerDriver):
                                           docker_api=docker)
             network = requested_network['network']
             if network in container.addresses:
-                raise exception.ZunException('Container %(container)s has'
-                                             ' alreay connected to the network'
+                raise exception.ZunException('Container %(container)s has '
+                                             'alreay connected to the network '
                                              '%(network)s.'
                                              % {'container': container.uuid,
                                                 'network': network})