diff --git a/html/includes/api_functions.inc.php b/html/includes/api_functions.inc.php
index 5e1dcd532..5a0725f65 100644
--- a/html/includes/api_functions.inc.php
+++ b/html/includes/api_functions.inc.php
@@ -353,8 +353,11 @@ function show_endpoints() {
 function list_bgp() {
     global $config;
     $app = \Slim\Slim::getInstance();
-    $router = $app->router()->getCurrentRoute()->getParams();
     $code = 500;
+    $status = 'error';
+    $message = 'Error retrieving bgpPeers';
+    $sql = '';
+    $sql_params = array();
     $hostname = $_GET['hostname'];
     $device_id = ctype_digit($hostname) ? $hostname : getidbyname($hostname);
     if(is_numeric($device_id)) {
@@ -363,8 +366,12 @@ function list_bgp() {
     }
     $bgp_sessions = dbFetchRows("SELECT * FROM bgpPeers WHERE `bgpPeerState` IS NOT NULL AND `bgpPeerState` != '' $sql", $sql_params);
     $total_bgp_sessions = count($bgp_sessions);
-    $code = 200;
-    $output = array("status" => "ok", "count" => $total_bgp_sessions, "bgp_sessions" => $bgp_sessions);
+    if(is_numeric($total_bgp_sessions)) {
+        $code = 200;
+        $status = 'ok';
+        $message = '';
+    }
+    $output = array("status" => "$status", "err-msg" => $message, "count" => $total_bgp_sessions, "bgp_sessions" => $bgp_sessions);
     $app->response->setStatus($code);
     $app->response->headers->set('Content-Type', 'application/json');
     echo _json_encode($output);