diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
index 62c084e..dba5e92 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
@@ -294,6 +294,7 @@
                 return new MastershipEvent(MASTER_CHANGED, deviceId,
                                            getNodes(deviceId));
             }
+
         case STANDBY:
         case NONE:
             boolean modified = addToBackup(deviceId, nodeId);
@@ -301,6 +302,8 @@
                 return new MastershipEvent(BACKUPS_CHANGED, deviceId,
                                            getNodes(deviceId));
             }
+            break;
+
         default:
             log.warn("unknown Mastership Role {}", role);
         }
@@ -332,12 +335,17 @@
             incrementTerm(deviceId);
             return new MastershipEvent(MASTER_CHANGED, deviceId,
                                        getNodes(deviceId));
+
         case STANDBY:
             if (removeFromBackups(deviceId, nodeId)) {
                 return new MastershipEvent(BACKUPS_CHANGED, deviceId,
                                            getNodes(deviceId));
             }
+            break;
+
         case NONE:
+            break;
+
         default:
             log.warn("unknown Mastership Role {}", role);
         }