--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/AgentInformationDisplayFrame.java	Thu Feb 14 22:31:00 2013 +0100
+++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/views/AgentInformationDisplayFrame.java	Fri Feb 15 17:24:29 2013 -0500
@@ -346,18 +346,14 @@
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
+                backendsTableModel.setRowCount(0);
+
                 int i = 0;
                 for (Entry<String, String> entry : backendStatus.entrySet()) {
                     String backendName = entry.getKey();
                     String status = entry.getValue();
-                    int rowCount = backendsTableModel.getRowCount();
-                    if (i >= rowCount) {
-                        Object[] rowData = new String[] { backendName, status };
-                        backendsTableModel.insertRow(i, rowData);
-                    } else {
-                        backendsTableModel.setValueAt(backendName, i, 0);
-                        backendsTableModel.setValueAt(status, i, 1);
-                    }
+                    Object[] rowData = new String[] { backendName, status };
+                    backendsTableModel.insertRow(i, rowData);
                     i++;
                 }
 
@@ -454,11 +450,17 @@
 
             ListSelectionModel model = (ListSelectionModel) e.getSource();
             int rowIndex = model.getMinSelectionIndex();
+            if (rowIndex == -1) {
+                backendDescription.setText("");
+                return;
+            }
+
             String backendName = (String) backendsTableModel.getValueAt(rowIndex, 0);
             ActionEvent<ConfigurationAction> event = new ActionEvent<>(AgentInformationDisplayFrame.this,
                     ConfigurationAction.SHOW_BACKEND_DESCRIPTION);
             event.setPayload(backendName);
             fireAction(event);
+
         }
 
     }