diff --git a/ambari-agent/src/main/python/ambari_agent/ConfigurationBuilder.py b/ambari-agent/src/main/python/ambari_agent/ConfigurationBuilder.py
index 1aed2a1f6a3..fb912fb853a 100644
--- a/ambari-agent/src/main/python/ambari_agent/ConfigurationBuilder.py
+++ b/ambari-agent/src/main/python/ambari_agent/ConfigurationBuilder.py
@@ -30,7 +30,7 @@ def __init__(self, initializer_module):
 
   def get_configuration(self, cluster_id, service_name, component_name, configurations_timestamp=None):
     if cluster_id:
-      if configurations_timestamp and configurations_timestamp != self.configurations_cache.timestamp:
+      if configurations_timestamp and self.configurations_cache.timestamp < configurations_timestamp:
         raise Exception("Command requires configs with timestamp={0} but configs on agent have timestamp={1}".format(configurations_timestamp, self.configurations_cache.timestamp))
 
       metadata_cache = self.metadata_cache[cluster_id]
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
index d3a9c2d5b58..a7867015ffc 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
@@ -175,7 +175,7 @@ def get_property_for_active_namenode(hdfs_site, property_name, security_enabled,
     name_services = get_nameservices(hdfs_site)
     if len(name_services) > 1:
       raise Fail('Multiple name services not supported by this function')
-    name_service = name_services(hdfs_site)[0]
+    name_service = name_services[0]
     active_namenodes = get_namenode_states(hdfs_site, security_enabled, run_user)[0]
 
     if not len(active_namenodes):