diff --git a/compose/service.py b/compose/service.py
index e1b0c9166..a24b9733b 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -223,7 +223,7 @@ class Service(object):
             parallel_execute(
                 container_numbers,
                 lambda n: create_and_start(service=self, number=n),
-                lambda n: n,
+                lambda n: self.get_container_name(n),
                 "Creating and starting"
             )
 
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 4bb625a1b..6d0c97db3 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -735,7 +735,7 @@ class ServiceTest(DockerClientTestCase):
 
         self.assertEqual(len(service.containers()), 1)
         self.assertTrue(service.containers()[0].is_running)
-        self.assertIn("ERROR: for 2  Boom", mock_stderr.getvalue())
+        self.assertIn("ERROR: for composetest_web_2  Boom", mock_stderr.getvalue())
 
     def test_scale_with_unexpected_exception(self):
         """Test that when scaling if the API returns an error, that is not of type