diff --git a/sahara/plugins/general/exceptions.py b/sahara/plugins/general/exceptions.py
index ee9e17d517..8796449937 100644
--- a/sahara/plugins/general/exceptions.py
+++ b/sahara/plugins/general/exceptions.py
@@ -62,7 +62,7 @@ class InvalidComponentCountException(e.SaharaException):
     """
 
     def __init__(self, component, expected_count, count):
-        self.message = ("Hadoop cluster should contain {0} {1} components."
+        self.message = ("Hadoop cluster should contain {0} {1} component(s)."
                         " Actual {1} count is {2}".format(
                         expected_count, component, count))
         self.code = "INVALID_COMPONENT_COUNT"
diff --git a/sahara/tests/unit/service/validation/edp/test_job_executor.py b/sahara/tests/unit/service/validation/edp/test_job_executor.py
index 26b1897d95..233b7b07db 100644
--- a/sahara/tests/unit/service/validation/edp/test_job_executor.py
+++ b/sahara/tests/unit/service/validation/edp/test_job_executor.py
@@ -144,7 +144,7 @@ class TestJobExecValidation(u.ValidationTestCase):
                 "output_id": six.text_type(uuid.uuid4())
             },
             bad_req_i=(1, "INVALID_COMPONENT_COUNT",
-                       "Hadoop cluster should contain 1 oozie components. "
+                       "Hadoop cluster should contain 1 oozie component(s). "
                        "Actual oozie count is 0"))
 
         ng = tu.make_ng_dict('master', 42, ['oozie'], 1,