diff --git a/opm/core/wells/WellCollection.cpp b/opm/core/wells/WellCollection.cpp
index 3efa77ae2..6325fab4b 100644
--- a/opm/core/wells/WellCollection.cpp
+++ b/opm/core/wells/WellCollection.cpp
@@ -426,6 +426,7 @@ namespace Opm
                         // not sure if no water and no oil, what will happen here, zero guide_rate?
                         well_node.prodSpec().guide_rate_ = guide_rate;
                         well_node.prodSpec().guide_rate_type_ = ProductionSpecification::LIQ;
+                        break;
                     }
                     case ProductionSpecification::NONE: {
                         // Group control is not in use for this group.
diff --git a/opm/core/wells/WellsGroup.cpp b/opm/core/wells/WellsGroup.cpp
index 3fabba3b7..a57c7ed01 100644
--- a/opm/core/wells/WellsGroup.cpp
+++ b/opm/core/wells/WellsGroup.cpp
@@ -871,12 +871,14 @@ namespace Opm
                         } else {
                             // can not produce more to meet the target
                             OpmLog::info("group " + name() + " can not meet its target!");
+                            return true;
                         }
                     } else { // overproducing the target, the only possibility is that all the wells/groups are under individual control
                         // while somehow our algorithms did not make the wells/groups return group controls
                         // either we should fix the algorithm of determining the target for well to return group controls
                         // or we should do something here
                         OpmLog::info("group " + name() + " is overproducing its target!");
+                        return false;
                     }
                 }
             }