1 files changed, 5 insertions, 1 deletions
diff --git a/framework/src/onos/apps/routing/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java b/framework/src/onos/apps/routing/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java
index 23d7086c..064080fd 100644
--- a/framework/src/onos/apps/routing/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java
+++ b/framework/src/onos/apps/routing/src/main/java/org/onosproject/routing/cli/BgpSpeakersListCommand.java
@@ -50,13 +50,17 @@ public class BgpSpeakersListCommand extends AbstractShellCommand {
         ApplicationId appId = coreService.getAppId(RoutingService.ROUTER_APP_ID);
 
         BgpConfig config = configService.getConfig(appId, BgpConfig.class);
+        if (config == null) {
+            print("No speakers configured");
+            return;
+        }
 
         List<BgpConfig.BgpSpeakerConfig> bgpSpeakers =
                 Lists.newArrayList(config.bgpSpeakers());
 
         Collections.sort(bgpSpeakers, SPEAKERS_COMPARATOR);
 
-        if (config == null || config.bgpSpeakers().isEmpty()) {
+        if (config.bgpSpeakers().isEmpty()) {
             print("No speakers configured");
         } else {
             bgpSpeakers.forEach(