diff --git a/fuel_rest_api.py b/fuel_rest_api.py
index 12b53bb..4b02687 100644
--- a/fuel_rest_api.py
+++ b/fuel_rest_api.py
@@ -442,7 +442,7 @@
         yield Cluster(conn, **cluster_desc)
 
 
-def get_cluster_id(name, conn):
+def get_cluster_id(conn, name):
     """Get cluster id by name"""
     for cluster in get_all_clusters(conn):
         if cluster.name == name:
@@ -451,6 +451,8 @@
                 logger.debug('cluster id is %s' % cluster.id)
             return cluster.id
 
+    raise ValueError("Cluster {0} not found".format(name))
+
 
 sections = {
     'sahara': 'additional_components',