diff --git a/kolla_mesos/common/mesos_utils.py b/kolla_mesos/common/mesos_utils.py
index b0839ccc..eba32ce5 100644
--- a/kolla_mesos/common/mesos_utils.py
+++ b/kolla_mesos/common/mesos_utils.py
@@ -62,9 +62,9 @@ def get_number_of_nodes(mesos_client):
 def get_marathon(mesos_client):
     frameworks = mesos_client.get_frameworks()
     frameworks_names = map(operator.itemgetter('name'), frameworks)
+    marathon_framework = None
     for framework_name in frameworks_names:
         if "marathon" in framework_name:
             marathon_framework = framework_name
-        else:
-            marathon_framework = None
+            break
     return marathon_framework
diff --git a/kolla_mesos/tests/fakes/mesos.py b/kolla_mesos/tests/fakes/mesos.py
index c5af32fb..9620a211 100644
--- a/kolla_mesos/tests/fakes/mesos.py
+++ b/kolla_mesos/tests/fakes/mesos.py
@@ -38,7 +38,8 @@ MESOS_STATE_TAGGED_SLAVES = {
     ],
     'frameworks': [
         {'name': 'chronos_autodetect'},
-        {'name': 'marathon_autodetect'}
+        {'name': 'marathon_autodetect'},
+        {'name': 'another_framework'}
     ]
 }
 MESOS_STATE_UNTAGGED_SLAVES = {
@@ -55,7 +56,8 @@ MESOS_STATE_NO_SLAVES = {
 MESOS_STATE_FRAMEWORKS = {
     'frameworks': [
         {'name': 'chronos_autodetect'},
-        {'name': 'marathon_autodetect'}
+        {'name': 'marathon_autodetect'},
+        {'name': 'another_framework'}
     ]
 }